=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Jan 16 21:44:22 UTC 2026 On branch cf/6331 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-pg_terminate_backend_msg-and-pg_cancel_backend_ms.patch === Applying: pg_terminate_backend_msg and pg_cancel_backend_msg .git/rebase-apply/patch:121: trailing whitespace. .git/rebase-apply/patch:362: trailing whitespace. warning: 2 lines add whitespace errors. Using index info to reconstruct a base tree... M src/backend/catalog/system_functions.sql M src/backend/storage/ipc/ipci.c M src/backend/storage/ipc/signalfuncs.c M src/backend/tcop/postgres.c M src/backend/utils/init/postinit.c M src/include/catalog/pg_proc.dat Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/init/postinit.c Auto-merging src/backend/tcop/postgres.c Auto-merging src/backend/storage/ipc/signalfuncs.c Auto-merging src/backend/storage/ipc/ipci.c CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipci.c Auto-merging src/backend/catalog/system_functions.sql error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 pg_terminate_backend_msg and pg_cancel_backend_msg 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/catalog/system_functions.sql M src/backend/storage/ipc/ipci.c M src/backend/storage/ipc/signalfuncs.c M src/backend/tcop/postgres.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/Makefile M src/include/catalog/pg_proc.dat Removing src/backend/utils/misc/backend_msg.c Removing src/include/utils/backend_msg.h Removing src/test/modules/test_misc/t/010_backend_msg.pl === using patch(1) to apply patch ./v2-0001-pg_terminate_backend_msg-and-pg_cancel_backend_ms.patch === patching file src/backend/catalog/system_functions.sql patching file src/backend/storage/ipc/ipci.c Hunk #2 FAILED at 141. Hunk #3 FAILED at 329. 2 out of 3 hunks FAILED -- saving rejects to file src/backend/storage/ipc/ipci.c.rej patching file src/backend/storage/ipc/signalfuncs.c patching file src/backend/tcop/postgres.c patching file src/backend/utils/init/postinit.c Hunk #2 succeeded at 903 (offset 3 lines). patching file src/backend/utils/misc/Makefile patching file src/backend/utils/misc/backend_msg.c patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 6729 (offset 16 lines). patching file src/include/utils/backend_msg.h patching file src/test/modules/test_misc/t/010_backend_msg.pl Unstaged changes after reset: M src/backend/catalog/system_functions.sql M src/backend/storage/ipc/ipci.c M src/backend/storage/ipc/signalfuncs.c M src/backend/tcop/postgres.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/Makefile M src/include/catalog/pg_proc.dat Removing src/backend/storage/ipc/ipci.c.rej Removing src/backend/utils/misc/backend_msg.c Removing src/include/utils/backend_msg.h Removing src/test/modules/test_misc/t/010_backend_msg.pl === using 'git apply' to apply patch ./v2-0001-pg_terminate_backend_msg-and-pg_cancel_backend_ms.patch === /work/patches/./v2-0001-pg_terminate_backend_msg-and-pg_cancel_backend_ms.patch:148: trailing whitespace. /work/patches/./v2-0001-pg_terminate_backend_msg-and-pg_cancel_backend_ms.patch:389: trailing whitespace. Applied patch to 'src/backend/catalog/system_functions.sql' cleanly. Applied patch to 'src/backend/storage/ipc/ipci.c' with conflicts. Applied patch to 'src/backend/storage/ipc/signalfuncs.c' cleanly. Applied patch to 'src/backend/tcop/postgres.c' cleanly. Applied patch to 'src/backend/utils/init/postinit.c' cleanly. Applied patch to 'src/backend/utils/misc/Makefile' cleanly. Falling back to direct application... Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Falling back to direct application... Falling back to direct application... U src/backend/storage/ipc/ipci.c warning: 2 lines add whitespace errors. diff --cc src/backend/storage/ipc/ipci.c index 85c67b2c183,94a89ff5e57..00000000000 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@@ -140,7 -141,7 +141,11 @@@ CalculateShmemSize(void size = add_size(size, SlotSyncShmemSize()); size = add_size(size, AioShmemSize()); size = add_size(size, WaitLSNShmemSize()); ++<<<<<<< ours + size = add_size(size, LogicalDecodingCtlShmemSize()); ++======= + size = add_size(size, BackendStatusShmemSize()); ++>>>>>>> theirs /* include additional requested shmem from preload libraries */ size = add_size(size, total_addin_request); @@@ -329,7 -330,7 +334,11 @@@ CreateOrAttachShmemStructs(void InjectionPointShmemInit(); AioShmemInit(); WaitLSNShmemInit(); ++<<<<<<< ours + LogicalDecodingCtlShmemInit(); ++======= + BackendMsgShmemInit(); ++>>>>>>> theirs } /*