=== Applying patches on top of PostgreSQL commit ID bd4bd30ce6a7f08e95390c3fa068f2bfbe9fcee8 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Jun 9 10:03:25 UTC 2026 On branch cf/6156 nothing to commit, working tree clean === using 'git am' to apply patch ./v8-0001-Add-GoAway-protocol-message-for-graceful-but-fast.patch === Applying: Add GoAway protocol message for graceful but fast server shutdown/switchover Using index info to reconstruct a base tree... M doc/src/sgml/func/func-admin.sgml M doc/src/sgml/libpq.sgml M src/backend/postmaster/postmaster.c M src/backend/storage/ipc/procsignal.c M src/backend/tcop/backend_startup.c M src/backend/tcop/postgres.c M src/bin/psql/common.c M src/include/catalog/pg_proc.dat M src/include/storage/procsignal.h M src/interfaces/libpq/fe-connect.c M src/interfaces/libpq/fe-exec.c M src/interfaces/libpq/fe-protocol3.c M src/interfaces/libpq/libpq-fe.h M src/interfaces/libpq/libpq-int.h M src/test/modules/libpq_pipeline/libpq_pipeline.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/libpq_pipeline/libpq_pipeline.c Auto-merging src/interfaces/libpq/libpq-int.h Auto-merging src/interfaces/libpq/libpq-fe.h Auto-merging src/interfaces/libpq/fe-protocol3.c Auto-merging src/interfaces/libpq/fe-exec.c Auto-merging src/interfaces/libpq/fe-connect.c Auto-merging src/include/storage/procsignal.h Auto-merging src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat Auto-merging src/bin/psql/common.c Auto-merging src/backend/tcop/postgres.c Auto-merging src/backend/tcop/backend_startup.c Auto-merging src/backend/storage/ipc/procsignal.c Auto-merging src/backend/postmaster/postmaster.c Auto-merging doc/src/sgml/libpq.sgml Auto-merging doc/src/sgml/func/func-admin.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 Add GoAway protocol message for graceful but fast server shutdown/switchover 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-Add-GoAway-protocol-message-for-graceful-but-fast.patch === patching file doc/src/sgml/func/func-admin.sgml patching file doc/src/sgml/libpq.sgml Hunk #2 succeeded at 3029 (offset 17 lines). patching file doc/src/sgml/protocol.sgml patching file src/backend/postmaster/postmaster.c Hunk #1 succeeded at 2152 (offset 18 lines). patching file src/backend/storage/ipc/procsignal.c Hunk #1 succeeded at 713 (offset 16 lines). patching file src/backend/storage/ipc/signalfuncs.c patching file src/backend/tcop/backend_startup.c Hunk #1 succeeded at 807 (offset 28 lines). patching file src/backend/tcop/postgres.c Hunk #1 succeeded at 43 (offset 1 line). Hunk #2 succeeded at 98 (offset 3 lines). Hunk #3 succeeded at 530 (offset 12 lines). Hunk #4 succeeded at 3114 (offset 23 lines). patching file src/bin/psql/common.c Hunk #1 succeeded at 741 (offset 2 lines). Hunk #2 succeeded at 758 (offset 2 lines). patching file src/bin/psql/meson.build patching file src/bin/psql/t/040_goaway.pl patching file src/include/catalog/pg_proc.dat Hunk #1 FAILED at 6765. 1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/pg_proc.dat.rej patching file src/include/libpq/libpq-be.h patching file src/include/libpq/protocol.h patching file src/include/storage/procsignal.h Hunk #1 succeeded at 41 (offset 2 lines). patching file src/include/tcop/tcopprot.h patching file src/interfaces/libpq/exports.txt patching file src/interfaces/libpq/fe-connect.c Hunk #1 succeeded at 705 (offset 4 lines). patching file src/interfaces/libpq/fe-exec.c patching file src/interfaces/libpq/fe-protocol3.c Hunk #6 succeeded at 1921 (offset 1 line). Hunk #7 succeeded at 2428 (offset 12 lines). Hunk #8 succeeded at 2564 (offset 12 lines). patching file src/interfaces/libpq/libpq-fe.h Hunk #2 succeeded at 426 (offset 5 lines). patching file src/interfaces/libpq/libpq-int.h Hunk #1 succeeded at 514 (offset 3 lines). patching file src/test/modules/libpq_pipeline/libpq_pipeline.c Unstaged changes after reset: M doc/src/sgml/func/func-admin.sgml M doc/src/sgml/libpq.sgml M doc/src/sgml/protocol.sgml M src/backend/postmaster/postmaster.c M src/backend/storage/ipc/procsignal.c M src/backend/storage/ipc/signalfuncs.c M src/backend/tcop/backend_startup.c M src/backend/tcop/postgres.c M src/bin/psql/common.c M src/bin/psql/meson.build M src/include/libpq/libpq-be.h M src/include/libpq/protocol.h M src/include/storage/procsignal.h M src/include/tcop/tcopprot.h M src/interfaces/libpq/exports.txt M src/interfaces/libpq/fe-connect.c M src/interfaces/libpq/fe-exec.c M src/interfaces/libpq/fe-protocol3.c M src/interfaces/libpq/libpq-fe.h M src/interfaces/libpq/libpq-int.h M src/test/modules/libpq_pipeline/libpq_pipeline.c Removing src/bin/psql/t/040_goaway.pl Removing src/include/catalog/pg_proc.dat.rej === using 'git apply' to apply patch ./v8-0001-Add-GoAway-protocol-message-for-graceful-but-fast.patch === Applied patch to 'doc/src/sgml/func/func-admin.sgml' cleanly. Applied patch to 'doc/src/sgml/libpq.sgml' cleanly. Applied patch to 'doc/src/sgml/protocol.sgml' cleanly. Applied patch to 'src/backend/postmaster/postmaster.c' cleanly. Applied patch to 'src/backend/storage/ipc/procsignal.c' cleanly. Applied patch to 'src/backend/storage/ipc/signalfuncs.c' cleanly. Applied patch to 'src/backend/tcop/backend_startup.c' cleanly. Applied patch to 'src/backend/tcop/postgres.c' cleanly. Applied patch to 'src/bin/psql/common.c' cleanly. Applied patch to 'src/bin/psql/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/include/catalog/pg_proc.dat' with conflicts. Applied patch to 'src/include/libpq/libpq-be.h' cleanly. Applied patch to 'src/include/libpq/protocol.h' cleanly. Applied patch to 'src/include/storage/procsignal.h' cleanly. Applied patch to 'src/include/tcop/tcopprot.h' cleanly. Applied patch to 'src/interfaces/libpq/exports.txt' cleanly. Applied patch to 'src/interfaces/libpq/fe-connect.c' cleanly. Applied patch to 'src/interfaces/libpq/fe-exec.c' cleanly. Applied patch to 'src/interfaces/libpq/fe-protocol3.c' cleanly. Applied patch to 'src/interfaces/libpq/libpq-fe.h' cleanly. Applied patch to 'src/interfaces/libpq/libpq-int.h' cleanly. Applied patch to 'src/test/modules/libpq_pipeline/libpq_pipeline.c' cleanly. U src/include/catalog/pg_proc.dat diff --cc src/include/catalog/pg_proc.dat index be157a5fbe9,e8584a3e458..00000000000 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@@ -6775,7 -6763,13 +6775,17 @@@ { oid => '2096', descr => 'terminate a server process', proname => 'pg_terminate_backend', provolatile => 'v', prorettype => 'bool', proargtypes => 'int4 int8', proargnames => '{pid,timeout}', ++<<<<<<< ours + proargdefaults => '{0}', prosrc => 'pg_terminate_backend' }, ++======= + proargdefaults => '{0}', + prosrc => 'pg_terminate_backend' }, + { oid => '9018', descr => 'request a server process to send GoAway to its client', + proname => 'pg_goaway_backend', provolatile => 'v', prorettype => 'bool', + proargtypes => 'int4 int8', proargnames => '{pid,timeout}', + proargdefaults => '{0}', + prosrc => 'pg_goaway_backend' }, ++>>>>>>> theirs { oid => '2172', descr => 'prepare for taking an online backup', proname => 'pg_backup_start', provolatile => 'v', proparallel => 'r', prorettype => 'pg_lsn', proargtypes => 'text bool',