=== Applying patches on top of PostgreSQL commit ID 901ed9b352b41f034e17bc540725082a488fce31 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun May 10 07:00:25 UTC 2026
On branch cf/6530
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Simplify-SortSupport-implementation-for-macaddr.patch ===
Applying: Simplify SortSupport implementation for macaddr
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/mac.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/mac.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/mac.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Simplify SortSupport implementation for macaddr
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 ./v2-0001-Simplify-SortSupport-implementation-for-macaddr.patch ===
patching file src/backend/utils/adt/mac.c
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 33.
Hunk #3 FAILED at 365.
Hunk #4 FAILED at 406.
Hunk #5 FAILED at 469.
Hunk #6 FAILED at 489.
6 out of 6 hunks FAILED -- saving rejects to file src/backend/utils/adt/mac.c.rej
Removing src/backend/utils/adt/mac.c.rej
=== using 'git apply' to apply patch ./v2-0001-Simplify-SortSupport-implementation-for-macaddr.patch ===
Applied patch to 'src/backend/utils/adt/mac.c' with conflicts.
U src/backend/utils/adt/mac.c
diff --cc src/backend/utils/adt/mac.c
index 923c5af54f8,b72dee37319..00000000000
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@@ -382,8 -381,7 +381,12 @@@ macaddr_fast_cmp(Datum x, Datum y, Sort
  
  /*
   * Abbreviation is never aborted for macaddr because the 6-byte MAC address
++<<<<<<< ours
 + * fits entirely within a 64-bit Datum, making the abbreviated key
 + * authoritative.
++=======
+  * fits entirely within a 64-bit Datum, making the abbreviated key authoritative.
++>>>>>>> theirs
   */
  static bool
  macaddr_abbrev_abort(int memtupcount, SortSupport ssup)