=== Applying patches on top of PostgreSQL commit ID 742317a80f89a5d6476c20b3d07330f3ec0d4357 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Apr  4 15:18:23 UTC 2025
On branch cf/5550
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Implement-WAIT-FOR-command.patch ===
Applying: Implement WAIT FOR command
Using index info to reconstruct a base tree...
M	doc/src/sgml/high-availability.sgml
M	src/backend/access/transam/xact.c
M	src/backend/access/transam/xlog.c
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/commands/Makefile
M	src/backend/commands/meson.build
M	src/backend/parser/gram.y
M	src/backend/storage/ipc/ipci.c
M	src/backend/storage/lmgr/proc.c
M	src/backend/tcop/pquery.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/include/nodes/parsenodes.h
M	src/include/parser/kwlist.h
M	src/include/storage/lwlocklist.h
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/include/storage/lwlocklist.h
CONFLICT (content): Merge conflict in src/include/storage/lwlocklist.h
Auto-merging src/include/parser/kwlist.h
Auto-merging src/include/nodes/parsenodes.h
Auto-merging src/backend/utils/activity/wait_event_names.txt
CONFLICT (content): Merge conflict in src/backend/utils/activity/wait_event_names.txt
Auto-merging src/backend/tcop/pquery.c
Auto-merging src/backend/storage/lmgr/proc.c
Auto-merging src/backend/storage/ipc/ipci.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipci.c
Auto-merging src/backend/parser/gram.y
Auto-merging src/backend/commands/meson.build
Auto-merging src/backend/commands/Makefile
Auto-merging src/backend/access/transam/xlogrecovery.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging src/backend/access/transam/xact.c
Auto-merging doc/src/sgml/high-availability.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 Implement WAIT FOR command
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	doc/src/sgml/high-availability.sgml
M	doc/src/sgml/ref/allfiles.sgml
M	doc/src/sgml/reference.sgml
M	src/backend/access/transam/Makefile
M	src/backend/access/transam/meson.build
M	src/backend/access/transam/xact.c
M	src/backend/access/transam/xlog.c
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/commands/Makefile
M	src/backend/commands/meson.build
M	src/backend/lib/pairingheap.c
M	src/backend/parser/gram.y
M	src/backend/storage/ipc/ipci.c
M	src/backend/storage/lmgr/proc.c
M	src/backend/tcop/pquery.c
M	src/backend/tcop/utility.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/include/lib/pairingheap.h
M	src/include/nodes/parsenodes.h
M	src/include/parser/kwlist.h
M	src/include/storage/lwlocklist.h
M	src/include/tcop/cmdtaglist.h
M	src/test/recovery/meson.build
M	src/tools/pgindent/typedefs.list
Removing doc/src/sgml/ref/wait_for.sgml
Removing src/backend/access/transam/xlogwait.c
Removing src/backend/commands/wait.c
Removing src/include/access/xlogwait.h
Removing src/include/commands/wait.h
Removing src/test/recovery/t/045_wait_for_lsn.pl
=== using patch(1) to apply patch ./v6-0001-Implement-WAIT-FOR-command.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 ./v6-0001-Implement-WAIT-FOR-command.patch ===
Applied patch to 'doc/src/sgml/high-availability.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly.
Falling back to direct application...
Applied patch to 'doc/src/sgml/reference.sgml' cleanly.
Applied patch to 'src/backend/access/transam/Makefile' cleanly.
Applied patch to 'src/backend/access/transam/meson.build' cleanly.
Applied patch to 'src/backend/access/transam/xact.c' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/commands/Makefile' cleanly.
Applied patch to 'src/backend/commands/meson.build' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/lib/pairingheap.c' cleanly.
Applied patch to 'src/backend/parser/gram.y' cleanly.
Applied patch to 'src/backend/storage/ipc/ipci.c' with conflicts.
Applied patch to 'src/backend/storage/lmgr/proc.c' cleanly.
Applied patch to 'src/backend/tcop/pquery.c' cleanly.
Applied patch to 'src/backend/tcop/utility.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event_names.txt' with conflicts.
Falling back to direct application...
Falling back to direct application...
Applied patch to 'src/include/lib/pairingheap.h' cleanly.
Applied patch to 'src/include/nodes/parsenodes.h' cleanly.
Applied patch to 'src/include/parser/kwlist.h' cleanly.
Applied patch to 'src/include/storage/lwlocklist.h' with conflicts.
Applied patch to 'src/include/tcop/cmdtaglist.h' cleanly.
Applied patch to 'src/test/recovery/meson.build' cleanly.
Falling back to direct application...
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/backend/storage/ipc/ipci.c
U src/backend/utils/activity/wait_event_names.txt
U src/include/storage/lwlocklist.h
diff --cc src/backend/storage/ipc/ipci.c
index 2fa045e6b0f,27b447b7a7a..00000000000
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@@ -149,7 -149,7 +150,11 @@@ CalculateShmemSize(int *num_semaphores
  	size = add_size(size, WaitEventCustomShmemSize());
  	size = add_size(size, InjectionPointShmemSize());
  	size = add_size(size, SlotSyncShmemSize());
++<<<<<<< ours
 +	size = add_size(size, AioShmemSize());
++=======
+ 	size = add_size(size, WaitLSNShmemSize());
++>>>>>>> theirs
  
  	/* include additional requested shmem from preload libraries */
  	size = add_size(size, total_addin_request);
@@@ -342,7 -342,7 +347,11 @@@ CreateOrAttachShmemStructs(void
  	StatsShmemInit();
  	WaitEventCustomShmemInit();
  	InjectionPointShmemInit();
++<<<<<<< ours
 +	AioShmemInit();
++=======
+ 	WaitLSNShmemInit();
++>>>>>>> theirs
  }
  
  /*
diff --cc src/backend/utils/activity/wait_event_names.txt
index 8bce14c38fd,5849967882e..00000000000
--- a/src/backend/utils/activity/wait_event_names.txt
+++ b/src/backend/utils/activity/wait_event_names.txt
@@@ -350,7 -347,7 +351,11 @@@ WALSummarizer	"Waiting to read or updat
  DSMRegistry	"Waiting to read or update the dynamic shared memory registry."
  InjectionPoint	"Waiting to read or update information related to injection points."
  SerialControl	"Waiting to read or update shared <filename>pg_serial</filename> state."
++<<<<<<< ours
 +AioWorkerSubmissionQueue	"Waiting to access AIO worker submission queue."
++=======
+ WaitLSN	"Waiting to read or update shared Wait-for-LSN state."
++>>>>>>> theirs
  
  #
  # END OF PREDEFINED LWLOCKS (DO NOT CHANGE THIS LINE)
diff --cc src/include/storage/lwlocklist.h
index a9681738146,a3f66071288..00000000000
--- a/src/include/storage/lwlocklist.h
+++ b/src/include/storage/lwlocklist.h
@@@ -83,4 -83,4 +83,8 @@@ PG_LWLOCK(49, WALSummarizer
  PG_LWLOCK(50, DSMRegistry)
  PG_LWLOCK(51, InjectionPoint)
  PG_LWLOCK(52, SerialControl)
++<<<<<<< ours
 +PG_LWLOCK(53, AioWorkerSubmissionQueue)
++=======
+ PG_LWLOCK(53, WaitLSN)
++>>>>>>> theirs