=== Applying patches on top of PostgreSQL commit ID bffd7130e942e2bd45153ab09e5fab70e74ece58 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar  5 16:50:31 UTC 2026
On branch cf/5542
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v14-0001-Add-vectorized-API-for-visibility-map-lookup.patch ===
Applying: Add vectorized API for visibility map lookup
Using index info to reconstruct a base tree...
M	src/backend/access/heap/visibilitymap.c
M	src/include/access/visibilitymap.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/visibilitymap.h
CONFLICT (content): Merge conflict in src/include/access/visibilitymap.h
Auto-merging src/backend/access/heap/visibilitymap.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 Add vectorized API for visibility map lookup
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	src/backend/access/heap/visibilitymap.c
M	src/include/access/visibilitymap.h
=== using patch(1) to apply patch ./v14-0001-Add-vectorized-API-for-visibility-map-lookup.patch ===
patching file src/backend/access/heap/visibilitymap.c
Hunk #3 succeeded at 389 (offset -5 lines).
Hunk #4 succeeded at 425 (offset -5 lines).
Hunk #5 succeeded at 435 (offset -5 lines).
patching file src/include/access/visibilitymap.h
Hunk #1 FAILED at 41.
1 out of 1 hunk FAILED -- saving rejects to file src/include/access/visibilitymap.h.rej
Unstaged changes after reset:
M	src/backend/access/heap/visibilitymap.c
Removing src/include/access/visibilitymap.h.rej
=== using 'git apply' to apply patch ./v14-0001-Add-vectorized-API-for-visibility-map-lookup.patch ===
Applied patch to 'src/backend/access/heap/visibilitymap.c' cleanly.
Applied patch to 'src/include/access/visibilitymap.h' with conflicts.
U src/include/access/visibilitymap.h
diff --cc src/include/access/visibilitymap.h
index a0166c5b410,1fce032a48c..00000000000
--- a/src/include/access/visibilitymap.h
+++ b/src/include/access/visibilitymap.h
@@@ -32,16 -32,18 +32,31 @@@ extern bool visibilitymap_clear(Relatio
  extern void visibilitymap_pin(Relation rel, BlockNumber heapBlk,
  							  Buffer *vmbuf);
  extern bool visibilitymap_pin_ok(BlockNumber heapBlk, Buffer vmbuf);
++<<<<<<< ours
 +extern void visibilitymap_set(Relation rel,
 +							  BlockNumber heapBlk, Buffer heapBuf,
 +							  XLogRecPtr recptr,
 +							  Buffer vmBuf,
 +							  TransactionId cutoff_xid,
 +							  uint8 flags);
 +extern void visibilitymap_set_vmbits(BlockNumber heapBlk,
 +									 Buffer vmBuf, uint8 flags,
 +									 const RelFileLocator rlocator);
 +extern uint8 visibilitymap_get_status(Relation rel, BlockNumber heapBlk, Buffer *vmbuf);
++=======
+ extern uint8 visibilitymap_set(Relation rel,
+ 							   BlockNumber heapBlk, Buffer heapBuf,
+ 							   XLogRecPtr recptr,
+ 							   Buffer vmBuf,
+ 							   TransactionId cutoff_xid,
+ 							   uint8 flags);
+ extern uint8 visibilitymap_set_vmbits(BlockNumber heapBlk,
+ 									  Buffer vmBuf, uint8 flags,
+ 									  const RelFileLocator rlocator);
+ extern void visibilitymap_get_statusv(Relation rel, const BlockNumber *heapBlks,
+ 									  uint8 *statusv, int nblocks,
+ 									  Buffer *vmbuf);
++>>>>>>> theirs
  extern void visibilitymap_count(Relation rel, BlockNumber *all_visible, BlockNumber *all_frozen);
  extern BlockNumber visibilitymap_prepare_truncate(Relation rel,
  												  BlockNumber nheapblocks);