=== Applying patches on top of PostgreSQL commit ID 994f770a0fd55dfdeb96d1d60d35545ba2d51480 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Jun 29 13:45:29 UTC 2026
On branch cf/6847
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Update-comments-to-refer-to-the-correct-functions.patch ===
Applying: Update comments to refer to the correct functions
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xact.c
M	src/backend/access/transam/xlogprefetcher.c
M	src/backend/postmaster/startup.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/transam/xlogprefetcher.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlogprefetcher.c
Auto-merging src/backend/access/transam/xact.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update comments to refer to the correct functions
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 ./v2-0001-Update-comments-to-refer-to-the-correct-functions.patch ===
patching file src/backend/access/transam/xact.c
Hunk #1 FAILED at 6223.
Hunk #2 FAILED at 6361.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/access/transam/xact.c.rej
patching file src/backend/access/transam/xlogprefetcher.c
Hunk #1 FAILED at 804.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/transam/xlogprefetcher.c.rej
patching file src/backend/postmaster/startup.c
Hunk #1 FAILED at 118.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/postmaster/startup.c.rej
Removing src/backend/access/transam/xact.c.rej
Removing src/backend/access/transam/xlogprefetcher.c.rej
Removing src/backend/postmaster/startup.c.rej
=== using 'git apply' to apply patch ./v2-0001-Update-comments-to-refer-to-the-correct-functions.patch ===
Applied patch to 'src/backend/access/transam/xact.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogprefetcher.c' with conflicts.
Applied patch to 'src/backend/postmaster/startup.c' cleanly.
U src/backend/access/transam/xlogprefetcher.c
diff --cc src/backend/access/transam/xlogprefetcher.c
index dff57642ab4,1cfbbd04ddc..00000000000
--- a/src/backend/access/transam/xlogprefetcher.c
+++ b/src/backend/access/transam/xlogprefetcher.c
@@@ -806,12 -806,12 +806,21 @@@ XLogPrefetcherNextBlock(uintptr_t pgsr_
  		 * Several callsites need to be able to read exactly one record
  		 * without any internal readahead.  Examples: PerformWalRecovery()
  		 * trying to read the first record that follows a checkpoint has emode
++<<<<<<< ours
 +		 * set to PANIC, which might otherwise cause XLogPageRead() to panic
 +		 * on some future page, and FinishWalRecovery() determining where to
 +		 * start writing WAL next, which depends on the contents of the
 +		 * reader's internal buffer after reading one record. Therefore, don't
 +		 * even think about prefetching until the first record after
 +		 * XLogPrefetcherBeginRead() has been consumed.
++=======
+ 		 * set to PANIC, which might otherwise cause XLogPageRead() to panic on
+ 		 * some future page, and FinishWalRecovery() determining where to start
+ 		 * writing WAL next, which depends on the contents of the reader's
+ 		 * internal buffer after reading one record.
+ 		 * Therefore, don't even think about prefetching until the first
+ 		 * record after XLogPrefetcherBeginRead() has been consumed.
++>>>>>>> theirs
  		 */
  		if (prefetcher->reader->decode_queue_tail &&
  			prefetcher->reader->decode_queue_tail->lsn == prefetcher->begin_ptr)