=== Applying patches on top of PostgreSQL commit ID 315342ffedf6b81f629c42e87bfaedbcc7211646 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Dec 13 20:41:21 UTC 2025 On branch cf/5250 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Always-use-long-SLRU-segment-file-names.patch === Applying: Always use long SLRU segment file names Using index info to reconstruct a base tree... M src/backend/access/transam/clog.c M src/backend/access/transam/multixact.c M src/backend/access/transam/slru.c M src/backend/commands/async.c M src/backend/storage/lmgr/predicate.c M src/bin/pg_upgrade/pg_upgrade.c M src/bin/pg_upgrade/pg_upgrade.h M src/include/access/slru.h M src/test/modules/test_slru/test_slru.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/test_slru/test_slru.c Auto-merging src/include/access/slru.h Auto-merging src/bin/pg_upgrade/pg_upgrade.h Auto-merging src/bin/pg_upgrade/pg_upgrade.c Auto-merging src/backend/storage/lmgr/predicate.c Auto-merging src/backend/commands/async.c Auto-merging src/backend/access/transam/slru.c Auto-merging src/backend/access/transam/multixact.c CONFLICT (content): Merge conflict in src/backend/access/transam/multixact.c Auto-merging src/backend/access/transam/clog.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 Always use long SLRU segment file names 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/clog.c M src/backend/access/transam/commit_ts.c M src/backend/access/transam/multixact.c M src/backend/access/transam/slru.c M src/backend/access/transam/subtrans.c M src/backend/commands/async.c M src/backend/storage/lmgr/predicate.c M src/bin/pg_upgrade/pg_upgrade.c M src/bin/pg_upgrade/pg_upgrade.h M src/bin/pg_verifybackup/t/003_corruption.pl M src/include/access/slru.h M src/test/modules/test_slru/test_slru.c === using patch(1) to apply patch ./v6-0001-Always-use-long-SLRU-segment-file-names.patch === patching file src/backend/access/transam/clog.c Hunk #1 succeeded at 809 (offset 1 line). patching file src/backend/access/transam/commit_ts.c patching file src/backend/access/transam/multixact.c Hunk #1 FAILED at 1971. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/transam/multixact.c.rej patching file src/backend/access/transam/slru.c Hunk #2 succeeded at 231 (offset 1 line). Hunk #3 succeeded at 322 (offset 1 line). Hunk #4 succeeded at 1752 (offset 1 line). Hunk #5 succeeded at 1783 (offset 1 line). patching file src/backend/access/transam/subtrans.c patching file src/backend/commands/async.c Hunk #1 succeeded at 536 (offset -1 lines). patching file src/backend/storage/lmgr/predicate.c patching file src/bin/pg_upgrade/pg_upgrade.c Hunk #1 succeeded at 41 with fuzz 1. Hunk #2 succeeded at 65 (offset 1 line). Hunk #3 succeeded at 165 (offset 1 line). Hunk #4 succeeded at 906 (offset 30 lines). patching file src/bin/pg_upgrade/pg_upgrade.h Hunk #1 succeeded at 138 (offset 7 lines). patching file src/bin/pg_verifybackup/t/003_corruption.pl patching file src/include/access/slru.h Hunk #1 succeeded at 116 (offset -15 lines). Hunk #2 succeeded at 162 (offset -15 lines). patching file src/test/modules/test_slru/test_slru.c Hunk #1 succeeded at 213 with fuzz 2. Hunk #2 succeeded at 242 (offset 6 lines). Unstaged changes after reset: M src/backend/access/transam/clog.c M src/backend/access/transam/commit_ts.c M src/backend/access/transam/slru.c M src/backend/access/transam/subtrans.c M src/backend/commands/async.c M src/backend/storage/lmgr/predicate.c M src/bin/pg_upgrade/pg_upgrade.c M src/bin/pg_upgrade/pg_upgrade.h M src/bin/pg_verifybackup/t/003_corruption.pl M src/include/access/slru.h M src/test/modules/test_slru/test_slru.c Removing src/backend/access/transam/multixact.c.rej === using 'git apply' to apply patch ./v6-0001-Always-use-long-SLRU-segment-file-names.patch === Applied patch to 'src/backend/access/transam/clog.c' cleanly. Applied patch to 'src/backend/access/transam/commit_ts.c' cleanly. Applied patch to 'src/backend/access/transam/multixact.c' with conflicts. Applied patch to 'src/backend/access/transam/slru.c' cleanly. Applied patch to 'src/backend/access/transam/subtrans.c' cleanly. Applied patch to 'src/backend/commands/async.c' cleanly. Applied patch to 'src/backend/storage/lmgr/predicate.c' cleanly. Applied patch to 'src/bin/pg_upgrade/pg_upgrade.c' cleanly. Applied patch to 'src/bin/pg_upgrade/pg_upgrade.h' cleanly. Applied patch to 'src/bin/pg_verifybackup/t/003_corruption.pl' cleanly. Applied patch to 'src/include/access/slru.h' cleanly. Applied patch to 'src/test/modules/test_slru/test_slru.c' cleanly. U src/backend/access/transam/multixact.c diff --cc src/backend/access/transam/multixact.c index f4fab7edfee,d1c04948290..00000000000 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@@ -1738,8 -1977,7 +1737,12 @@@ MultiXactShmemInit(void "multixact_member", multixact_member_buffers, 0, "pg_multixact/members", LWTRANCHE_MULTIXACTMEMBER_BUFFER, LWTRANCHE_MULTIXACTMEMBER_SLRU, ++<<<<<<< ours + SYNC_HANDLER_MULTIXACT_MEMBER, + true); ++======= + SYNC_HANDLER_MULTIXACT_MEMBER); ++>>>>>>> theirs /* doesn't call SimpleLruTruncate() or meet criteria for unit tests */ /* Initialize our shared state struct */