=== Applying patches on top of PostgreSQL commit ID a7187c3723b41057522038c5e5db329d84f41ac4 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Apr  3 04:05:23 UTC 2025
On branch cf/5276
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-InstallXLogFileSegment-vs-concurrent-WAL-flush.patch ===
Applying: InstallXLogFileSegment() vs concurrent WAL flush
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
M	src/backend/storage/file/fd.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/storage/file/fd.c
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.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 InstallXLogFileSegment() vs concurrent WAL flush
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".
Unstaged changes after reset:
M	src/backend/access/transam/xlog.c
M	src/backend/storage/file/fd.c
=== using patch(1) to apply patch ./v3-0001-InstallXLogFileSegment-vs-concurrent-WAL-flush.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v3-0001-InstallXLogFileSegment-vs-concurrent-WAL-flush.patch ===
Applied patch to 'src/backend/access/transam/xlog.c' with conflicts.
Applied patch to 'src/backend/storage/file/fd.c' cleanly.
U src/backend/access/transam/xlog.c
diff --cc src/backend/access/transam/xlog.c
index ec40c0b7c42,a28a9a5dbea..00000000000
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@@ -5204,10 -5054,7 +5244,14 @@@ XLOGShmemInit(void
  	pg_atomic_init_u64(&XLogCtl->logWriteResult, InvalidXLogRecPtr);
  	pg_atomic_init_u64(&XLogCtl->logFlushResult, InvalidXLogRecPtr);
  	pg_atomic_init_u64(&XLogCtl->unloggedLSN, InvalidXLogRecPtr);
++<<<<<<< ours
 +
 +	pg_atomic_init_u64(&XLogCtl->InitializeReserved, InvalidXLogRecPtr);
 +	pg_atomic_init_u64(&XLogCtl->InitializedUpTo, InvalidXLogRecPtr);
 +	ConditionVariableInit(&XLogCtl->InitializedUpToCondVar);
++=======
+ 	pg_atomic_init_u64(&XLogCtl->last_known_installed_segno, lastKnownInstalledSegno);
++>>>>>>> theirs
  }
  
  /*