=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Apr 15 07:56:32 UTC 2026 On branch cf/5616 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Expose-f_smgr-to-extensions-for-manual-implementa.patch === Applying: Expose f_smgr to extensions for manual implementation Using index info to reconstruct a base tree... M src/backend/postmaster/postmaster.c M src/backend/storage/smgr/md.c M src/backend/storage/smgr/smgr.c M src/backend/utils/init/miscinit.c M src/include/miscadmin.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/miscadmin.h Auto-merging src/backend/utils/init/miscinit.c Auto-merging src/backend/storage/smgr/smgr.c Auto-merging src/backend/storage/smgr/md.c Auto-merging src/backend/postmaster/postmaster.c CONFLICT (content): Merge conflict in src/backend/postmaster/postmaster.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 Expose f_smgr to extensions for manual implementation 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 ./v6-0001-Expose-f_smgr-to-extensions-for-manual-implementa.patch === patching file src/backend/postmaster/postmaster.c Hunk #1 succeeded at 929 with fuzz 2. patching file src/backend/storage/smgr/md.c Hunk #1 succeeded at 96 (offset 1 line). Hunk #2 succeeded at 156 (offset 1 line). Hunk #3 succeeded at 248 (offset 1 line). Hunk #4 succeeded at 258 (offset 1 line). Hunk #5 succeeded at 269 (offset 1 line). Hunk #6 succeeded at 312 (offset 1 line). Hunk #7 succeeded at 536 (offset 1 line). Hunk #8 succeeded at 563 (offset 1 line). Hunk #9 succeeded at 587 (offset 1 line). Hunk #10 succeeded at 602 (offset 1 line). Hunk #11 succeeded at 637 (offset 1 line). Hunk #12 succeeded at 703 (offset 12 lines). Hunk #13 succeeded at 723 (offset 12 lines). Hunk #14 succeeded at 733 (offset 12 lines). Hunk #15 succeeded at 763 (offset 12 lines). Hunk #16 succeeded at 776 (offset 12 lines). Hunk #17 succeeded at 786 (offset 12 lines). Hunk #18 succeeded at 802 (offset 12 lines). Hunk #19 succeeded at 815 (offset 12 lines). Hunk #20 succeeded at 913 (offset 12 lines). Hunk #21 succeeded at 926 (offset 12 lines). Hunk #22 succeeded at 1054 (offset 12 lines). Hunk #23 succeeded at 1062 (offset 12 lines). Hunk #24 succeeded at 1128 (offset 12 lines). Hunk #25 succeeded at 1146 (offset 12 lines). Hunk #26 succeeded at 1216 (offset 12 lines). Hunk #27 succeeded at 1235 (offset 12 lines). Hunk #28 succeeded at 1251 (offset 12 lines). Hunk #29 succeeded at 1295 (offset 12 lines). Hunk #30 succeeded at 1318 (offset 12 lines). Hunk #31 succeeded at 1341 (offset 12 lines). Hunk #32 succeeded at 1364 (offset 12 lines). Hunk #33 succeeded at 1385 (offset 12 lines). Hunk #34 succeeded at 1407 (offset 12 lines). Hunk #35 succeeded at 1433 (offset 12 lines). Hunk #36 succeeded at 1453 (offset 12 lines). Hunk #37 succeeded at 1463 (offset 12 lines). Hunk #38 succeeded at 1471 (offset 12 lines). Hunk #39 succeeded at 1505 (offset 12 lines). Hunk #40 succeeded at 1515 (offset 12 lines). Hunk #41 succeeded at 1523 (offset 12 lines). Hunk #42 succeeded at 1549 (offset 12 lines). Hunk #43 succeeded at 1559 (offset 12 lines). Hunk #44 succeeded at 1582 (offset 12 lines). Hunk #45 succeeded at 1707 (offset 12 lines). Hunk #46 succeeded at 1755 (offset 12 lines). Hunk #47 succeeded at 1775 (offset 12 lines). Hunk #48 succeeded at 1818 (offset 12 lines). Hunk #49 succeeded at 1892 (offset 12 lines). Hunk #50 succeeded at 1947 (offset 12 lines). Hunk #51 succeeded at 1970 (offset 12 lines). patching file src/backend/storage/smgr/smgr.c patching file src/backend/utils/init/miscinit.c Hunk #2 succeeded at 194 (offset 1 line). Hunk #3 succeeded at 1878 (offset 2 lines). patching file src/include/miscadmin.h Hunk #1 succeeded at 543 (offset 19 lines). patching file src/include/storage/md.h patching file src/include/storage/smgr.h patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 1737 (offset 48 lines). [cf/5616 09b3416424a] Expose f_smgr to extensions for manual implementation Author: Matthias van de Meent Date: Tue Jun 27 15:59:23 2023 +0200 8 files changed, 285 insertions(+), 151 deletions(-) === using 'git am' to apply patch ./v6-0002-Add-checkpoint_create_hook.patch === Applying: Add checkpoint_create_hook === using 'git am' to apply patch ./v6-0003-Add-src-test-modules-fsync_checker.patch === Applying: Add src/test/modules/fsync_checker === using 'git am' to apply patch ./v6-0004-Refactor-smgr-API-mdcreate-needs-the-old-relfilel.patch === Applying: Refactor smgr API: mdcreate needs the old relfilelocator === using 'git am' to apply patch ./v6-0005-SMGR-GUC-variable-and-chaining.patch === Applying: SMGR GUC variable and chaining error: sha1 information is lacking or useless (src/backend/storage/smgr/md.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 SMGR GUC variable and chaining 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 ./v6-0005-SMGR-GUC-variable-and-chaining.patch === patching file src/backend/postmaster/postmaster.c patching file src/backend/storage/smgr/md.c Hunk #1 succeeded at 136 (offset 1 line). Hunk #2 succeeded at 194 (offset 1 line). Hunk #3 succeeded at 265 (offset 1 line). Hunk #4 succeeded at 278 (offset 1 line). Hunk #5 succeeded at 289 (offset 1 line). Hunk #6 succeeded at 299 (offset 1 line). Hunk #7 succeeded at 415 (offset 1 line). Hunk #8 succeeded at 565 (offset 1 line). Hunk #9 succeeded at 631 (offset 1 line). Hunk #10 succeeded at 793 (offset 12 lines). Hunk #11 succeeded at 806 (offset 12 lines). Hunk #12 succeeded at 830 (offset 12 lines). Hunk #13 succeeded at 928 (offset 12 lines). Hunk #14 succeeded at 942 (offset 12 lines). Hunk #15 succeeded at 1082 (offset 12 lines). Hunk #16 succeeded at 1157 (offset 12 lines). Hunk #17 succeeded at 1264 (offset 12 lines). Hunk #18 succeeded at 1325 (offset 12 lines). Hunk #19 succeeded at 1393 (offset 12 lines). Hunk #20 succeeded at 1483 (offset 12 lines). Hunk #21 succeeded at 1494 (offset 12 lines). Hunk #22 succeeded at 1535 (offset 12 lines). Hunk #23 succeeded at 1546 (offset 12 lines). Hunk #24 succeeded at 1589 (offset 12 lines). Hunk #25 succeeded at 1928 (offset 12 lines). patching file src/backend/storage/smgr/smgr.c Hunk #28 succeeded at 1046 with fuzz 1. patching file src/backend/tcop/postgres.c Hunk #1 succeeded at 4174 (offset 79 lines). patching file src/backend/utils/init/miscinit.c Hunk #1 FAILED at 56. Hunk #2 succeeded at 1788 (offset 2 lines). Hunk #3 succeeded at 1866 (offset 2 lines). Hunk #4 succeeded at 1944 (offset 2 lines). 1 out of 4 hunks FAILED -- saving rejects to file src/backend/utils/init/miscinit.c.rej patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 1518 (offset 89 lines). Hunk #2 succeeded at 2741 (offset 109 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 855 (offset 39 lines). patching file src/include/miscadmin.h Hunk #1 succeeded at 535 (offset 19 lines). Hunk #2 succeeded at 546 (offset 19 lines). patching file src/include/storage/md.h patching file src/include/storage/smgr.h patching file src/test/modules/fsync_checker/fsync_checker_smgr.c patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2735 (offset 70 lines). Unstaged changes after reset: M src/backend/postmaster/postmaster.c M src/backend/storage/smgr/md.c M src/backend/storage/smgr/smgr.c M src/backend/tcop/postgres.c M src/backend/utils/init/miscinit.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/include/miscadmin.h M src/include/storage/md.h M src/include/storage/smgr.h M src/test/modules/fsync_checker/fsync_checker_smgr.c M src/tools/pgindent/typedefs.list Removing src/backend/utils/init/miscinit.c.rej === using 'git apply' to apply patch ./v6-0005-SMGR-GUC-variable-and-chaining.patch === Applied patch to 'src/backend/postmaster/postmaster.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/storage/smgr/smgr.c:893 error: src/backend/storage/smgr/smgr.c: patch does not apply Applied patch to 'src/backend/tcop/postgres.c' cleanly. Applied patch to 'src/backend/utils/init/miscinit.c' with conflicts. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly. Applied patch to 'src/include/miscadmin.h' cleanly. Applied patch to 'src/include/storage/md.h' cleanly. Applied patch to 'src/include/storage/smgr.h' cleanly. Applied patch to 'src/test/modules/fsync_checker/fsync_checker_smgr.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application...