=== Applying patches on top of PostgreSQL commit ID 1ae87df63ff693a91fbcb968850103a5a5d8cd96 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Jul 13 12:41:32 UTC 2026 On branch cf/7005 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Enable-Visual-Studio-s-stdatomic.h-support.patch === Applying: Enable Visual Studio's stdatomic.h support === using 'git am' to apply patch ./v3-0002-Redefine-port-atomics.h-on-top-of-stdatomic.h.patch === Applying: Redefine port/atomics.h on top of Using index info to reconstruct a base tree... M src/include/c.h M src/include/port/atomics.h M src/include/port/atomics/arch-x86.h M src/include/port/atomics/generic.h M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list CONFLICT (modify/delete): src/include/port/atomics/generic.h deleted in Redefine port/atomics.h on top of and modified in HEAD. Version HEAD of src/include/port/atomics/generic.h left in tree. Removing src/include/port/atomics/fallback.h Auto-merging src/include/port/atomics/arch-x86.h CONFLICT (content): Merge conflict in src/include/port/atomics/arch-x86.h Removing src/include/port/atomics/arch-ppc.h Removing src/include/port/atomics/arch-arm.h Auto-merging src/include/port/atomics.h CONFLICT (content): Merge conflict in src/include/port/atomics.h Auto-merging src/include/c.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Redefine port/atomics.h on top of 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 ./v3-0002-Redefine-port-atomics.h-on-top-of-stdatomic.h.patch === patching file src/include/c.h patching file src/include/port/atomics.h Hunk #2 FAILED at 47. Hunk #6 FAILED at 155. Hunk #7 succeeded at 596 (offset -5 lines). 2 out of 7 hunks FAILED -- saving rejects to file src/include/port/atomics.h.rej patching file src/include/port/atomics/arch-arm.h patching file src/include/port/atomics/arch-ppc.h patching file src/include/port/atomics/arch-x86.h Hunk #2 FAILED at 39. 1 out of 2 hunks FAILED -- saving rejects to file src/include/port/atomics/arch-x86.h.rej patching file src/include/port/atomics/fallback.h patching file src/include/port/atomics/generic-gcc.h patching file src/include/port/atomics/generic-msvc.h patching file src/include/port/atomics/generic.h Hunk #1 FAILED at 1. Not deleting file src/include/port/atomics/generic.h as content differs from patch 1 out of 1 hunk FAILED -- saving rejects to file src/include/port/atomics/generic.h.rej patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 4025 with fuzz 2 (offset 78 lines). Unstaged changes after reset: M src/include/c.h M src/include/port/atomics.h D src/include/port/atomics/arch-arm.h D src/include/port/atomics/arch-ppc.h M src/include/port/atomics/arch-x86.h D src/include/port/atomics/fallback.h M src/include/port/atomics/generic-gcc.h M src/include/port/atomics/generic-msvc.h M src/tools/pgindent/typedefs.list Removing src/include/port/atomics.h.rej Removing src/include/port/atomics/arch-x86.h.rej Removing src/include/port/atomics/generic.h.rej === using 'git apply' to apply patch ./v3-0002-Redefine-port-atomics.h-on-top-of-stdatomic.h.patch === Applied patch to 'src/include/c.h' cleanly. Applied patch to 'src/include/port/atomics.h' with conflicts. Falling back to direct application... Falling back to direct application... Applied patch to 'src/include/port/atomics/arch-x86.h' with conflicts. Falling back to direct application... Applied patch to 'src/include/port/atomics/generic-gcc.h' cleanly. Applied patch to 'src/include/port/atomics/generic-msvc.h' cleanly. Falling back to direct application... error: patch failed: src/include/port/atomics/generic.h:1 error: src/include/port/atomics/generic.h: patch does not apply Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.