=== Applying patches on top of PostgreSQL commit ID 17e805e8d8152db474bb368ab95cac127dfe6a4f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Jul 20 18:51:27 UTC 2026
On branch cf/7006
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Track-relation-writes-that-bypass-shared-buffers-in-.patch ===
Applying: Track relation writes that bypass shared buffers in pg_stat_io
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
M	src/backend/utils/activity/pgstat_io.c
M	src/include/pgstat.h
M	src/test/regress/expected/stats.out
M	src/test/regress/sql/stats.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/stats.sql
Auto-merging src/test/regress/expected/stats.out
CONFLICT (content): Merge conflict in src/test/regress/expected/stats.out
Auto-merging src/include/pgstat.h
Auto-merging src/backend/utils/activity/pgstat_io.c
Auto-merging doc/src/sgml/monitoring.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Track relation writes that bypass shared buffers in pg_stat_io
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
=== using patch(1) to apply patch ./0001-Track-relation-writes-that-bypass-shared-buffers-in-.patch ===
patching file doc/src/sgml/monitoring.sgml
Hunk #1 succeeded at 2902 (offset 20 lines).
Hunk #2 succeeded at 3017 (offset 20 lines).
patching file src/backend/storage/smgr/bulk_write.c
patching file src/backend/utils/activity/pgstat_io.c
Hunk #5 succeeded at 466 with fuzz 1.
Hunk #6 succeeded at 564 (offset 33 lines).
patching file src/include/pgstat.h
patching file src/test/regress/expected/stats.out
Hunk #2 FAILED at 47.
Hunk #3 succeeded at 87 (offset -7 lines).
Hunk #4 succeeded at 97 (offset -7 lines).
Hunk #5 FAILED at 116.
Hunk #6 succeeded at 1819 (offset 16 lines).
2 out of 6 hunks FAILED -- saving rejects to file src/test/regress/expected/stats.out.rej
patching file src/test/regress/sql/stats.sql
Hunk #1 succeeded at 856 (offset 7 lines).
Unstaged changes after reset:
M	doc/src/sgml/monitoring.sgml
M	src/backend/storage/smgr/bulk_write.c
M	src/backend/utils/activity/pgstat_io.c
M	src/include/pgstat.h
M	src/test/regress/expected/stats.out
M	src/test/regress/sql/stats.sql
Removing src/test/regress/expected/stats.out.rej
=== using 'git apply' to apply patch ./0001-Track-relation-writes-that-bypass-shared-buffers-in-.patch ===
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'src/backend/storage/smgr/bulk_write.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_io.c' cleanly.
Applied patch to 'src/include/pgstat.h' cleanly.
Applied patch to 'src/test/regress/expected/stats.out' with conflicts.
Applied patch to 'src/test/regress/sql/stats.sql' cleanly.
U src/test/regress/expected/stats.out
diff --cc src/test/regress/expected/stats.out
index e230356de13,80e8af9aae5..00000000000
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@@ -52,12 -56,23 +56,32 @@@ client backend|temp relation|norma
  client backend|wal|init
  client backend|wal|normal
  datachecksums launcher|relation|bulkread
++<<<<<<< ours
 +datachecksums launcher|relation|normal
 +datachecksums launcher|wal|init
 +datachecksums launcher|wal|normal
 +datachecksums worker|relation|bulkread
 +datachecksums worker|relation|normal
 +datachecksums worker|relation|vacuum
++=======
+ datachecksums launcher|relation|bulkwrite
+ datachecksums launcher|relation|bypass
+ datachecksums launcher|relation|init
+ datachecksums launcher|relation|normal
+ datachecksums launcher|relation|vacuum
+ datachecksums launcher|temp relation|bypass
+ datachecksums launcher|temp relation|normal
+ datachecksums launcher|wal|init
+ datachecksums launcher|wal|normal
+ datachecksums worker|relation|bulkread
+ datachecksums worker|relation|bulkwrite
+ datachecksums worker|relation|bypass
+ datachecksums worker|relation|init
+ datachecksums worker|relation|normal
+ datachecksums worker|relation|vacuum
+ datachecksums worker|temp relation|bypass
+ datachecksums worker|temp relation|normal
++>>>>>>> theirs
  datachecksums worker|wal|init
  datachecksums worker|wal|normal
  io worker|relation|bulkread
@@@ -104,31 -127,8 +136,35 @@@ walsummarizer|wal|ini
  walsummarizer|wal|normal
  walwriter|wal|init
  walwriter|wal|normal
++<<<<<<< ours
 +(88 rows)
++=======
+ (111 rows)
++>>>>>>> theirs
  \a
 +-- List of registered statistics kinds.
 +SELECT id, name, fixed_amount,
 +    accessed_across_databases AS across_db, write_to_file
 +  FROM pg_stat_kind_info
 +  WHERE builtin
 +  ORDER BY id;
 + id |     name     | fixed_amount | across_db | write_to_file 
 +----+--------------+--------------+-----------+---------------
 +  1 | database     | f            | t         | t
 +  2 | relation     | f            | f         | t
 +  3 | function     | f            | f         | t
 +  4 | replslot     | f            | t         | t
 +  5 | subscription | f            | t         | t
 +  6 | backend      | f            | t         | f
 +  7 | archiver     | t            | f         | t
 +  8 | bgwriter     | t            | f         | t
 +  9 | checkpointer | t            | f         | t
 + 10 | io           | t            | f         | t
 + 11 | lock         | t            | f         | t
 + 12 | slru         | t            | f         | t
 + 13 | wal          | t            | f         | t
 +(13 rows)
 +
  -- ensure that both seqscan and indexscan plans are allowed
  SET enable_seqscan TO on;
  SET enable_indexscan TO on;