=== Applying patches on top of PostgreSQL commit ID f20c4278342f6afc44b856e98a0850f9dd2df0a8 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Aug 22 19:29:24 UTC 2026 On branch cf/7154 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Remove-execdebug.h-and-its-infrastructure.patch === Applying: Remove execdebug.h and its infrastructure Using index info to reconstruct a base tree... M src/backend/executor/nodeIncrementalSort.c M src/backend/executor/nodeMergejoin.c M src/backend/executor/nodeNestloop.c M src/backend/executor/nodeSort.c M src/backend/jit/llvm/llvmjit_expr.c A src/include/executor/execdebug.h Falling back to patching base and 3-way merge... Auto-merging src/backend/executor/nodeNestloop.c CONFLICT (content): Merge conflict in src/backend/executor/nodeNestloop.c Auto-merging src/backend/executor/nodeMergejoin.c CONFLICT (content): Merge conflict in src/backend/executor/nodeMergejoin.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 Remove execdebug.h and its infrastructure 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 ./0001-Remove-execdebug.h-and-its-infrastructure.patch === The next patch would delete the file src/include/executor/execdebug.h, which does not exist! Skipping patch. 1 out of 1 hunk ignored patching file src/backend/executor/nodeIncrementalSort.c Hunk #1 FAILED at 78. Hunk #2 FAILED at 328. Hunk #3 FAILED at 397. Hunk #4 FAILED at 412. Hunk #5 FAILED at 430. Hunk #6 FAILED at 443. Hunk #7 FAILED at 555. Hunk #8 FAILED at 567. Hunk #9 FAILED at 690. Hunk #10 FAILED at 759. Hunk #11 FAILED at 770. Hunk #12 FAILED at 811. Hunk #13 FAILED at 830. Hunk #14 FAILED at 925. Hunk #15 FAILED at 941. Hunk #16 FAILED at 975. Hunk #17 FAILED at 1062. Hunk #18 FAILED at 1074. Hunk #19 FAILED at 1097. 19 out of 19 hunks FAILED -- saving rejects to file src/backend/executor/nodeIncrementalSort.c.rej patching file src/backend/executor/nodeMergejoin.c Hunk #1 FAILED at 93. Hunk #2 FAILED at 462. Hunk #3 FAILED at 493. Hunk #4 FAILED at 530. Hunk #5 FAILED at 632. Hunk #6 FAILED at 647. Hunk #7 FAILED at 677. Hunk #8 FAILED at 695. Hunk #9 FAILED at 732. Hunk #10 FAILED at 757. Hunk #11 FAILED at 787. Hunk #12 FAILED at 820. Hunk #13 FAILED at 828. Hunk #14 FAILED at 848. Hunk #15 FAILED at 875. Hunk #16 FAILED at 894. Hunk #17 FAILED at 949. Hunk #18 FAILED at 971. Hunk #19 FAILED at 987. Hunk #20 FAILED at 1039. Hunk #21 FAILED at 1050. Hunk #22 FAILED at 1177. Hunk #23 FAILED at 1185. Hunk #24 FAILED at 1211. Hunk #25 FAILED at 1233. Hunk #26 FAILED at 1249. Hunk #27 FAILED at 1273. Hunk #28 FAILED at 1299. Hunk #29 FAILED at 1319. Hunk #30 FAILED at 1341. Hunk #31 FAILED at 1369. Hunk #32 FAILED at 1387. Hunk #33 FAILED at 1411. Hunk #34 FAILED at 1448. Hunk #35 FAILED at 1621. Hunk #36 FAILED at 1637. 36 out of 36 hunks FAILED -- saving rejects to file src/backend/executor/nodeMergejoin.c.rej patching file src/backend/executor/nodeNestloop.c Hunk #1 FAILED at 21. Hunk #2 FAILED at 76. Hunk #3 FAILED at 95. Hunk #4 FAILED at 105. Hunk #5 FAILED at 113. Hunk #6 FAILED at 148. Hunk #7 FAILED at 178. Hunk #8 FAILED at 187. Hunk #9 FAILED at 209. Hunk #10 FAILED at 236. Hunk #11 FAILED at 250. Hunk #12 FAILED at 267. Hunk #13 FAILED at 346. Hunk #14 FAILED at 361. 14 out of 14 hunks FAILED -- saving rejects to file src/backend/executor/nodeNestloop.c.rej patching file src/backend/executor/nodeSort.c Hunk #1 FAILED at 16. Hunk #2 FAILED at 60. Hunk #3 FAILED at 79. Hunk #4 FAILED at 91. Hunk #5 FAILED at 179. Hunk #6 FAILED at 223. Hunk #7 FAILED at 287. Hunk #8 FAILED at 300. Hunk #9 FAILED at 314. 9 out of 9 hunks FAILED -- saving rejects to file src/backend/executor/nodeSort.c.rej patching file src/backend/jit/llvm/llvmjit_expr.c Hunk #1 FAILED at 23. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/jit/llvm/llvmjit_expr.c.rej Removing src/backend/executor/nodeIncrementalSort.c.rej Removing src/backend/executor/nodeMergejoin.c.rej Removing src/backend/executor/nodeNestloop.c.rej Removing src/backend/executor/nodeSort.c.rej Removing src/backend/jit/llvm/llvmjit_expr.c.rej === using 'git apply' to apply patch ./0001-Remove-execdebug.h-and-its-infrastructure.patch === error: src/include/executor/execdebug.h: does not exist in index Applied patch to 'src/backend/executor/nodeIncrementalSort.c' cleanly. Applied patch to 'src/backend/executor/nodeMergejoin.c' with conflicts. Applied patch to 'src/backend/executor/nodeNestloop.c' with conflicts. Applied patch to 'src/backend/executor/nodeSort.c' cleanly. Applied patch to 'src/backend/jit/llvm/llvmjit_expr.c' cleanly.