=== Applying patches on top of PostgreSQL commit ID d6d8054dc72d4844f52f1552f8d3074c16987e32 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Mar 30 02:52:23 UTC 2025
On branch cf/4620
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Execute-hardware-CRC-computation-in-parallel.patch ===
Applying: Execute hardware CRC computation in parallel
Using index info to reconstruct a base tree...
M	configure
M	configure.ac
M	src/port/Makefile
M	src/port/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/port/meson.build
CONFLICT (content): Merge conflict in src/port/meson.build
Auto-merging src/port/Makefile
CONFLICT (content): Merge conflict in src/port/Makefile
Auto-merging configure.ac
Auto-merging configure
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Execute hardware CRC computation in parallel
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	configure
M	configure.ac
M	src/include/port/pg_crc32c.h
M	src/port/Makefile
M	src/port/meson.build
M	src/port/pg_crc32c_armv8.c
M	src/port/pg_crc32c_sb8.c
M	src/port/pg_crc32c_sse42.c
=== using patch(1) to apply patch ./v10-0001-Execute-hardware-CRC-computation-in-parallel.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 <patchfile
=== using 'git apply' to apply patch ./v10-0001-Execute-hardware-CRC-computation-in-parallel.patch ===
Applied patch to 'configure' cleanly.
Applied patch to 'configure.ac' cleanly.
Applied patch to 'src/include/port/pg_crc32c.h' cleanly.
Applied patch to 'src/port/Makefile' with conflicts.
Applied patch to 'src/port/meson.build' with conflicts.
Applied patch to 'src/port/pg_crc32c_armv8.c' cleanly.
Applied patch to 'src/port/pg_crc32c_sb8.c' cleanly.
Applied patch to 'src/port/pg_crc32c_sse42.c' cleanly.
U src/port/Makefile
U src/port/meson.build
diff --cc src/port/Makefile
index f11896440d5,a8e2467a866..00000000000
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@@ -44,8 -44,7 +44,12 @@@ OBJS = 
  	noblock.o \
  	path.o \
  	pg_bitutils.o \
++<<<<<<< ours
 +	pg_localeconv_r.o \
 +	pg_popcount_aarch64.o \
++=======
+ 	pg_crc32c_sb8.o \
++>>>>>>> theirs
  	pg_popcount_avx512.o \
  	pg_strong_random.o \
  	pgcheckdir.o \
diff --cc src/port/meson.build
index cf7f07644b9,8aed1de2d1d..00000000000
--- a/src/port/meson.build
+++ b/src/port/meson.build
@@@ -7,8 -7,7 +7,12 @@@ pgport_sources = 
    'noblock.c',
    'path.c',
    'pg_bitutils.c',
++<<<<<<< ours
 +  'pg_localeconv_r.c',
 +  'pg_popcount_aarch64.c',
++=======
+   'pg_crc32c_sb8.c',
++>>>>>>> theirs
    'pg_popcount_avx512.c',
    'pg_strong_random.c',
    'pgcheckdir.c',