=== Applying patches on top of PostgreSQL commit ID e624e1fd13dcc754deebfd8a5be8f6fa578e17da ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Oct  5 04:17:31 UTC 2026
On branch cf/6733
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-Mention-checkpoints-in-online-data-checksums-docs.patch ===
Applying: Mention checkpoints in online data checksums docs
Using index info to reconstruct a base tree...
M	doc/src/sgml/wal.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/wal.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/wal.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 Mention checkpoints in online data checksums docs
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 ./v5-0001-Mention-checkpoints-in-online-data-checksums-docs.patch ===
patching file doc/src/sgml/wal.sgml
Hunk #1 FAILED at 357.
1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/wal.sgml.rej
Removing doc/src/sgml/wal.sgml.rej
=== using 'git apply' to apply patch ./v5-0001-Mention-checkpoints-in-online-data-checksums-docs.patch ===
Applied patch to 'doc/src/sgml/wal.sgml' with conflicts.
U doc/src/sgml/wal.sgml
diff --cc doc/src/sgml/wal.sgml
index 1adafaf6176,1adfca01aa5..00000000000
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
@@@ -404,7 -368,8 +410,12 @@@
        <listitem><para>
         I/O: all pages need to have data checksums calculated and written which
         will generate a lot of dirty pages that will need to be flushed to disk,
++<<<<<<< ours
 +       as well as WAL-logged.
++=======
+        as well as WAL logged. Both enabling and disabling data checksums requires
+        performing checkpoints, which may generate a lot of writes.
++>>>>>>> theirs
        </para></listitem>
        <listitem><para>
         Replication: When the standby receives the data checksum state change