=== Applying patches on top of PostgreSQL commit ID 454c046094ab3431c2ce0c540c46e623bc05bd1a ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Sep 14 04:15:20 UTC 2025
On branch cf/5622
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v11-0001-cpuidex-check-Support-detecting-newer-GCC-versio.patch ===
Applying: cpuidex check: Support detecting newer GCC versions defining it in cpuid.h
Using index info to reconstruct a base tree...
M	configure
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
Auto-merging configure
CONFLICT (content): Merge conflict in 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 cpuidex check: Support detecting newer GCC versions defining it in cpuid.h
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	meson.build
M	src/port/pg_crc32c_sse42_choose.c
M	src/port/pg_popcount_avx512.c
=== using patch(1) to apply patch ./v11-0001-cpuidex-check-Support-detecting-newer-GCC-versio.patch ===
patching file configure
Hunk #1 FAILED at 17675.
1 out of 1 hunk FAILED -- saving rejects to file configure.rej
patching file meson.build
Hunk #1 succeeded at 2012 (offset -23 lines).
patching file src/port/pg_crc32c_sse42_choose.c
patching file src/port/pg_popcount_avx512.c
Unstaged changes after reset:
M	meson.build
M	src/port/pg_crc32c_sse42_choose.c
M	src/port/pg_popcount_avx512.c
Removing configure.rej
=== using 'git apply' to apply patch ./v11-0001-cpuidex-check-Support-detecting-newer-GCC-versio.patch ===
Applied patch to 'configure' with conflicts.
Applied patch to 'meson.build' cleanly.
Applied patch to 'src/port/pg_crc32c_sse42_choose.c' cleanly.
Applied patch to 'src/port/pg_popcount_avx512.c' cleanly.
U configure
diff --cc configure
index 22cd866147b,1d5d47f44d3..00000000000
--- a/configure
+++ b/configure
@@@ -17494,7 -17684,7 +17498,11 @@@ in
  main ()
  {
  unsigned int exx[4] = {0, 0, 0, 0};
++<<<<<<< ours
 +    __cpuidex(exx, 7, 0);
++=======
+   __cpuidex(exx, 7, 0);
++>>>>>>> theirs
  
    ;
    return 0;