=== Applying patches on top of PostgreSQL commit ID c06d1a4ba6b26eef27b04074683cccade6c277ee ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun May  3 19:53:23 UTC 2026
On branch cf/6678
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v8-0001-Use-barrier-semantics-when-reading-writing-writte.patch ===
Applying: Use barrier semantics when reading/writing writtenUpto
Using index info to reconstruct a base tree...
M	src/backend/replication/walreceiver.c
M	src/backend/replication/walreceiverfuncs.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/walreceiverfuncs.c
CONFLICT (content): Merge conflict in src/backend/replication/walreceiverfuncs.c
Auto-merging src/backend/replication/walreceiver.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 Use barrier semantics when reading/writing writtenUpto
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 ./v8-0001-Use-barrier-semantics-when-reading-writing-writte.patch ===
patching file src/backend/replication/walreceiver.c
Hunk #1 FAILED at 975.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/replication/walreceiver.c.rej
patching file src/backend/replication/walreceiverfuncs.c
Hunk #1 FAILED at 321.
Hunk #2 FAILED at 363.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/replication/walreceiverfuncs.c.rej
Removing src/backend/replication/walreceiver.c.rej
Removing src/backend/replication/walreceiverfuncs.c.rej
=== using 'git apply' to apply patch ./v8-0001-Use-barrier-semantics-when-reading-writing-writte.patch ===
Applied patch to 'src/backend/replication/walreceiver.c' cleanly.
Applied patch to 'src/backend/replication/walreceiverfuncs.c' with conflicts.
U src/backend/replication/walreceiverfuncs.c
diff --cc src/backend/replication/walreceiverfuncs.c
index a0ed853e2f6,9447913c0e7..00000000000
--- a/src/backend/replication/walreceiverfuncs.c
+++ b/src/backend/replication/walreceiverfuncs.c
@@@ -321,11 -321,7 +321,15 @@@ RequestXLogStreaming(TimeLineID tli, XL
  		walrcv->flushedUpto = recptr;
  		walrcv->receivedTLI = tli;
  		walrcv->latestChunkStart = recptr;
++<<<<<<< ours
 +
 +		/*
 +		 * Pairs with pg_atomic_read_membarrier_u64() in
 +		 * GetWalRcvWriteRecPtr().
 +		 */
++=======
+ 		/* Pairs with pg_atomic_read_membarrier_u64() in GetWalRcvWriteRecPtr(). */
++>>>>>>> theirs
  		pg_atomic_write_membarrier_u64(&walrcv->writtenUpto, recptr);
  	}
  	walrcv->receiveStart = recptr;