=== Applying patches on top of PostgreSQL commit ID b59783502224c0ae721974a5d9b6fb915cbd37e1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Aug  8 09:32:22 UTC 2026
On branch cf/7049
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Only-clear-VACUUM-s-read-stream-strategy-once-in-fai.patch ===
Applying: Only clear VACUUM's read stream strategy once in failsafe mode
Using index info to reconstruct a base tree...
M	src/backend/access/heap/vacuumlazy.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/heap/vacuumlazy.c
CONFLICT (content): Merge conflict in src/backend/access/heap/vacuumlazy.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 Only clear VACUUM's read stream strategy once in failsafe mode
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-Only-clear-VACUUM-s-read-stream-strategy-once-in-fai.patch ===
patching file src/backend/access/heap/vacuumlazy.c
Hunk #1 FAILED at 1285.
Hunk #2 FAILED at 1389.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/access/heap/vacuumlazy.c.rej
Removing src/backend/access/heap/vacuumlazy.c.rej
=== using 'git apply' to apply patch ./0001-Only-clear-VACUUM-s-read-stream-strategy-once-in-fai.patch ===
Applied patch to 'src/backend/access/heap/vacuumlazy.c' with conflicts.
U src/backend/access/heap/vacuumlazy.c
diff --cc src/backend/access/heap/vacuumlazy.c
index 9bce43e563c,cb9f23436f1..00000000000
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@@ -1390,7 -1390,7 +1390,11 @@@ lazy_scan_heap(LVRelState *vacrel
  		 * If the wraparound failsafe has engaged -- either via the check
  		 * above or during index vacuuming invoked from this loop -- stop
  		 * using the buffer access strategy so that the rest of the vacuum may
++<<<<<<< ours
 +		 * use all of shared buffers. Failsafe mode stays engaged once
++=======
+ 		 * use all of shared buffers.  Failsafe mode stays engaged once
++>>>>>>> theirs
  		 * triggered, so we only need to do this once.
  		 */
  		if (unlikely(VacuumFailsafeActive) && !strategy_cleared)