=== Applying patches on top of PostgreSQL commit ID 5142f0093e648d1a32fdcc7c835d17fa103e1239 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Apr 20 01:59:33 UTC 2026 On branch cf/5726 nothing to commit, working tree clean === using 'git am' to apply patch ./v13-0001-Enable-autovectorizing-page-checksums-with-AVX2-.patch === Applying: Enable autovectorizing page checksums with AVX2 where available Using index info to reconstruct a base tree... M config/c-compiler.m4 M configure M configure.ac M meson.build M src/backend/storage/page/checksum.c M src/include/pg_config.h.in M src/include/port/pg_cpu.h M src/include/storage/checksum_impl.h M src/port/pg_cpu_x86.c Falling back to patching base and 3-way merge... Auto-merging src/port/pg_cpu_x86.c Auto-merging src/include/storage/checksum_impl.h CONFLICT (content): Merge conflict in src/include/storage/checksum_impl.h Auto-merging src/include/port/pg_cpu.h Auto-merging src/include/pg_config.h.in Auto-merging src/backend/storage/page/checksum.c CONFLICT (content): Merge conflict in src/backend/storage/page/checksum.c Auto-merging meson.build CONFLICT (content): Merge conflict in meson.build Auto-merging configure.ac Auto-merging configure Auto-merging config/c-compiler.m4 CONFLICT (content): Merge conflict in config/c-compiler.m4 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Enable autovectorizing page checksums with AVX2 where available 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 ./v13-0001-Enable-autovectorizing-page-checksums-with-AVX2-.patch === patching file config/c-compiler.m4 Hunk #1 succeeded at 712 with fuzz 2 (offset 25 lines). patching file configure Hunk #1 succeeded at 17906 (offset 181 lines). patching file configure.ac Hunk #1 succeeded at 2162 (offset 33 lines). patching file meson.build Hunk #1 succeeded at 2528 (offset 77 lines). patching file src/backend/storage/page/checksum.c Hunk #1 FAILED at 13. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/storage/page/checksum.c.rej patching file src/include/pg_config.h.in Hunk #1 succeeded at 683 (offset 6 lines). patching file src/include/port/pg_cpu.h Hunk #1 succeeded at 27 with fuzz 2 (offset 3 lines). patching file src/include/storage/checksum_block.inc.c patching file src/include/storage/checksum_impl.h Hunk #1 FAILED at 72. Hunk #2 FAILED at 89. Hunk #3 succeeded at 140 (offset 2 lines). Hunk #4 FAILED at 148. 3 out of 4 hunks FAILED -- saving rejects to file src/include/storage/checksum_impl.h.rej patching file src/port/pg_cpu_x86.c Hunk #1 succeeded at 128 with fuzz 2 (offset 7 lines). Unstaged changes after reset: M config/c-compiler.m4 M configure M configure.ac M meson.build M src/include/pg_config.h.in M src/include/port/pg_cpu.h M src/include/storage/checksum_impl.h M src/port/pg_cpu_x86.c Removing src/backend/storage/page/checksum.c.rej Removing src/include/storage/checksum_block.inc.c Removing src/include/storage/checksum_impl.h.rej === using 'git apply' to apply patch ./v13-0001-Enable-autovectorizing-page-checksums-with-AVX2-.patch === Applied patch to 'config/c-compiler.m4' with conflicts. Applied patch to 'configure' cleanly. Applied patch to 'configure.ac' cleanly. Applied patch to 'meson.build' with conflicts. Applied patch to 'src/backend/storage/page/checksum.c' with conflicts. Applied patch to 'src/include/pg_config.h.in' cleanly. Applied patch to 'src/include/port/pg_cpu.h' cleanly. Falling back to direct application... Applied patch to 'src/include/storage/checksum_impl.h' with conflicts. Applied patch to 'src/port/pg_cpu_x86.c' cleanly. U config/c-compiler.m4 U meson.build U src/backend/storage/page/checksum.c U src/include/storage/checksum_impl.h diff --cc config/c-compiler.m4 index 3eab0da9cb6,4d5acf8be6e..00000000000 --- a/config/c-compiler.m4 +++ b/config/c-compiler.m4 @@@ -692,12 -692,10 +692,19 @@@ undefine([Ac_cachevar])dn # Check if the compiler supports AVX2 as a target # # If AVX2 target attribute is supported, sets pgac_avx2_support. ++<<<<<<< ours +# +# There is deliberately not a guard for __has_attribute here +AC_DEFUN([PGAC_AVX2_SUPPORT], +[define([Ac_cachevar], [AS_TR_SH([pgac_cv_avx2_support])])dnl +AC_CACHE_CHECK([for AVX2 target attribute support], [Ac_cachevar], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ ++======= + AC_DEFUN([PGAC_AVX2_SUPPORT], + [define([Ac_cachevar], [AS_TR_SH([pgac_cv_avx2_support])])dnl + AC_CACHE_CHECK([for AVX2 target attribute support], [Ac_cachevar], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ++>>>>>>> theirs __attribute__((target("avx2"))) static int avx2_test(void) { diff --cc meson.build index 60c8cdc3a06,5cf23195a6a..00000000000 --- a/meson.build +++ b/meson.build @@@ -2503,12 -2453,13 +2503,20 @@@ endi ############################################################### # Check if the compiler supports AVX2 as a target ++<<<<<<< ours +# There is deliberately not a guard for __has_attribute here ++======= ++>>>>>>> theirs ############################################################### if host_cpu == 'x86_64' prog = ''' ++<<<<<<< ours ++======= + #include + #include ++>>>>>>> theirs __attribute__((target("avx2"))) static int avx2_test(void) { diff --cc src/backend/storage/page/checksum.c index 030c44f7308,7ce51fe9d2e..00000000000 --- a/src/backend/storage/page/checksum.c +++ b/src/backend/storage/page/checksum.c @@@ -30,7 -30,7 +30,11 @@@ static uint32 pg_checksum_block_fallback(const PGChecksummablePage *page) { ++<<<<<<< ours +#include "storage/checksum_block_internal.h" ++======= + #include "storage/checksum_block.inc.c" ++>>>>>>> theirs } /* @@@ -41,7 -41,7 +45,11 @@@ pg_attribute_target("avx2" static uint32 pg_checksum_block_avx2(const PGChecksummablePage *page) { ++<<<<<<< ours +#include "storage/checksum_block_internal.h" ++======= + #include "storage/checksum_block.inc.c" ++>>>>>>> theirs } #endif /* USE_AVX2_WITH_RUNTIME_CHECK */ diff --cc src/include/storage/checksum_impl.h index 576673b7b85,28570abdda0..00000000000 --- a/src/include/storage/checksum_impl.h +++ b/src/include/storage/checksum_impl.h @@@ -153,9 -150,11 +156,17 @@@ static uint32 (*pg_checksum_block) (con static uint32 pg_checksum_block(const PGChecksummablePage *page) { ++<<<<<<< ours +#include "storage/checksum_block_internal.h" +} + ++======= + #include "storage/checksum_block.inc.c" + } + + #else + static uint32 (*pg_checksum_block) (const PGChecksummablePage *page); ++>>>>>>> theirs #endif /*