=== Applying patches on top of PostgreSQL commit ID 36aed19fd99021ad9f727e4fd4bceb086a7cf54d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Sep  1 01:09:20 UTC 2025
On branch cf/5806
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Optimize-transaction-waiting-during-logical-deco.patch ===
Applying: Optimize transaction waiting during logical decoding on hot standby servers. On hot standby servers, XactLockTableWait falls back to polling TransactionIdIsInProgress() with fixed 1ms sleeps when transactions from the primary have no local lock table entries, causing excessive CPU usage.
.git/rebase-apply/patch:115: trailing whitespace.
						hash_estimate_size(MaxBackends + NUM_AUXILIARY_PROCS, 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/backend/storage/ipc/procarray.c
M	src/backend/storage/lmgr/lmgr.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/storage/lmgr/lmgr.c
Auto-merging src/backend/storage/ipc/procarray.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/procarray.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 Optimize transaction waiting during logical decoding on hot standby servers. On hot standby servers, XactLockTableWait falls back to polling TransactionIdIsInProgress() with fixed 1ms sleeps when transactions from the primary have no local lock table entries, causing excessive CPU usage.
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/replication/logical/snapbuild.c
M	src/backend/storage/ipc/procarray.c
M	src/backend/storage/lmgr/lmgr.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/include/storage/lwlocklist.h
M	src/include/storage/procarray.h
=== using patch(1) to apply patch ./v10-0001-Optimize-transaction-waiting-during-logical-deco.patch ===
patching file src/backend/replication/logical/snapbuild.c
patching file src/backend/storage/ipc/procarray.c
Hunk #1 FAILED at 62.
1 out of 19 hunks FAILED -- saving rejects to file src/backend/storage/ipc/procarray.c.rej
patching file src/backend/storage/lmgr/lmgr.c
patching file src/backend/utils/activity/wait_event_names.txt
patching file src/include/storage/lwlocklist.h
patching file src/include/storage/procarray.h
Unstaged changes after reset:
M	src/backend/replication/logical/snapbuild.c
M	src/backend/storage/ipc/procarray.c
M	src/backend/storage/lmgr/lmgr.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/include/storage/lwlocklist.h
M	src/include/storage/procarray.h
Removing src/backend/storage/ipc/procarray.c.rej
=== using 'git apply' to apply patch ./v10-0001-Optimize-transaction-waiting-during-logical-deco.patch ===
/work/patches/./v10-0001-Optimize-transaction-waiting-during-logical-deco.patch:127: trailing whitespace.
						hash_estimate_size(MaxBackends + NUM_AUXILIARY_PROCS, 
Applied patch to 'src/backend/replication/logical/snapbuild.c' cleanly.
Applied patch to 'src/backend/storage/ipc/procarray.c' with conflicts.
Applied patch to 'src/backend/storage/lmgr/lmgr.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly.
Applied patch to 'src/include/storage/lwlocklist.h' cleanly.
Applied patch to 'src/include/storage/procarray.h' cleanly.
U src/backend/storage/ipc/procarray.c
warning: 1 line adds whitespace errors.
diff --cc src/backend/storage/ipc/procarray.c
index 200f72c6e25,ee732e7fd86..00000000000
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@@ -61,7 -62,7 +61,11 @@@
  #include "storage/procarray.h"
  #include "utils/acl.h"
  #include "utils/builtins.h"
++<<<<<<< ours
 +#include "utils/lsyscache.h"
++=======
+ #include "utils/hsearch.h"
++>>>>>>> theirs
  #include "utils/rel.h"
  #include "utils/snapmgr.h"