=== Applying patches on top of PostgreSQL commit ID 24cb3a08a43b5a48f5fba4a83d297218e2e748c5 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Jan 9 12:04:20 UTC 2026 On branch cf/5789 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Inline-CRC-computation-for-small-fixed-length-inp.patch === Applying: Inline CRC computation for small fixed-length input on Arm === using 'git am' to apply patch ./v1-0002-Compute-CRC32C-on-ARM-using-the-Crypto-Extension-.patch === Applying: Compute CRC32C on ARM using the Crypto Extension where available error: sha1 information is lacking or useless (src/include/port/pg_crc32c.h). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Compute CRC32C on ARM using the Crypto Extension 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 ./v1-0002-Compute-CRC32C-on-ARM-using-the-Crypto-Extension-.patch === patching file meson.build Hunk #1 succeeded at 2555 (offset 32 lines). patching file src/include/port/pg_crc32c.h patching file src/port/meson.build Hunk #1 succeeded at 93 (offset -1 lines). patching file src/port/pg_crc32c_armv8.c Hunk #1 FAILED at 15. Hunk #2 succeeded at 77 (offset 4 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/port/pg_crc32c_armv8.c.rej patching file src/port/pg_crc32c_armv8_choose.c Hunk #1 succeeded at 108 (offset 1 line). Hunk #2 succeeded at 136 (offset 1 line). Unstaged changes after reset: M meson.build M src/include/port/pg_crc32c.h M src/port/meson.build M src/port/pg_crc32c_armv8.c M src/port/pg_crc32c_armv8_choose.c Removing src/port/pg_crc32c_armv8.c.rej === using 'git apply' to apply patch ./v1-0002-Compute-CRC32C-on-ARM-using-the-Crypto-Extension-.patch === Applied patch to 'meson.build' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/port/meson.build' cleanly. Applied patch to 'src/port/pg_crc32c_armv8.c' with conflicts. Applied patch to 'src/port/pg_crc32c_armv8_choose.c' cleanly. U src/port/pg_crc32c_armv8.c diff --cc src/port/pg_crc32c_armv8.c index 039986c7b33,f67de2016b4..00000000000 --- a/src/port/pg_crc32c_armv8.c +++ b/src/port/pg_crc32c_armv8.c @@@ -14,10 -14,9 +14,15 @@@ */ #include "c.h" +#ifdef _MSC_VER +#include +#else #include ++<<<<<<< ours ++======= + #ifdef USE_PMULL_CRC32C_WITH_RUNTIME_CHECK + #include ++>>>>>>> theirs #endif #include "port/pg_crc32c.h"