=== Applying patches on top of PostgreSQL commit ID e5aeed4b8020424fa882c3d1969d00c2b2d8cf30 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Mar 20 07:17:20 UTC 2025 On branch cf/5100 nothing to commit, working tree clean === using 'git am' to apply patch ./v10-0001-Add-a-Postgres-SQL-function-for-crc32c-benchmark.patch === Applying: Add a Postgres SQL function for crc32c benchmarking. === using 'git am' to apply patch ./v10-0002-Refactor-consolidate-x86-ISA-and-OS-runtime-chec.patch === Applying: Refactor: consolidate x86 ISA and OS runtime checks .git/rebase-apply/patch:349: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M src/include/port/pg_bitutils.h M src/port/meson.build M src/port/pg_bitutils.c M src/port/pg_crc32c_sse42_choose.c M src/port/pg_popcount_avx512.c Falling back to patching base and 3-way merge... Auto-merging src/port/pg_popcount_avx512.c Auto-merging src/port/pg_crc32c_sse42_choose.c Auto-merging src/port/pg_bitutils.c Auto-merging src/port/meson.build Auto-merging src/include/port/pg_bitutils.h === using 'git am' to apply patch ./v10-0003-Add-AVX-512-CRC32C-algorithm-with-a-runtime-chec.patch === Applying: Add AVX-512 CRC32C algorithm with a runtime check .git/rebase-apply/patch:499: indent with spaces. /* .git/rebase-apply/patch:500: indent with spaces. * __i386__ is defined by gcc and Intel compiler on Linux, .git/rebase-apply/patch:501: indent with spaces. * _M_IX86 by VS compiler, .git/rebase-apply/patch:502: indent with spaces. * i386 by Sun compilers on opensolaris at least .git/rebase-apply/patch:503: indent with spaces. */ warning: squelched 17 whitespace errors warning: 22 lines add whitespace errors. Using index info to reconstruct a base tree... 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_crc32c.h M src/port/meson.build M src/port/pg_crc32c_sse42.c M src/port/pg_crc32c_sse42_choose.c Falling back to patching base and 3-way merge... CONFLICT (modify/delete): src/port/pg_crc32c_sse42_choose.c deleted in Add AVX-512 CRC32C algorithm with a runtime check and modified in HEAD. Version HEAD of src/port/pg_crc32c_sse42_choose.c left in tree. Auto-merging src/port/pg_crc32c_sse42.c Auto-merging src/port/meson.build Auto-merging src/include/port/pg_crc32c.h Auto-merging src/include/pg_config.h.in Auto-merging meson.build Auto-merging configure.ac Auto-merging configure Auto-merging 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 Add AVX-512 CRC32C algorithm with a runtime check 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". 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_crc32c.h M src/include/port/pg_hw_feat_check.h M src/port/meson.build M src/port/pg_crc32c_sse42.c M src/port/pg_hw_feat_check.c Removing src/include/pg_cpu.h Removing src/port/pg_crc32c_avx512.c Removing src/port/pg_crc32c_x86_choose.c === using patch(1) to apply patch ./v10-0003-Add-AVX-512-CRC32C-algorithm-with-a-runtime-chec.patch === patch: unrecognized option `--no-backup-if-mismatch' usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] [-r rej-name] [-V t | nil | never | none] [-x number] [-z backup-ext] [--posix] [origfile [patchfile]] patch