=== Applying patches on top of PostgreSQL commit ID e8bfad4ca842733b957c01e732ec009778f952cd ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Nov  8 08:47:23 UTC 2025
On branch cf/5542
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v12-0001-IOS-TableAM-Support-AM-specific-fast-visibility-.patch ===
Applying: IOS/TableAM: Support AM-specific fast visibility tests
Using index info to reconstruct a base tree...
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/backend/access/heap/visibilitymap.c
M	src/backend/access/index/indexam.c
M	src/backend/utils/adt/selfuncs.c
M	src/include/access/heapam.h
M	src/include/access/tableam.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/tableam.h
Auto-merging src/include/access/heapam.h
Auto-merging src/backend/utils/adt/selfuncs.c
Auto-merging src/backend/access/index/indexam.c
Auto-merging src/backend/access/heap/visibilitymap.c
Auto-merging src/backend/access/heap/heapam_handler.c
Auto-merging src/backend/access/heap/heapam.c
=== using 'git am' to apply patch ./v12-0002-GIST-Fix-visibility-issues-in-IOS.patch ===
Applying: GIST: Fix visibility issues in IOS
Using index info to reconstruct a base tree...
M	src/backend/access/gist/gistget.c
M	src/backend/access/gist/gistvacuum.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/gist/gistvacuum.c
CONFLICT (content): Merge conflict in src/backend/access/gist/gistvacuum.c
Auto-merging src/backend/access/gist/gistget.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 GIST: Fix visibility issues in IOS
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/gist/gistget.c
M	src/backend/access/gist/gistscan.c
M	src/backend/access/gist/gistvacuum.c
M	src/include/access/gist_private.h
=== using patch(1) to apply patch ./v12-0002-GIST-Fix-visibility-issues-in-IOS.patch ===
patching file src/backend/access/gist/gistget.c
patching file src/backend/access/gist/gistscan.c
patching file src/backend/access/gist/gistvacuum.c
Hunk #1 FAILED at 325.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/gist/gistvacuum.c.rej
patching file src/include/access/gist_private.h
Unstaged changes after reset:
M	src/backend/access/gist/gistget.c
M	src/backend/access/gist/gistscan.c
M	src/include/access/gist_private.h
Removing src/backend/access/gist/gistvacuum.c.rej
=== using 'git apply' to apply patch ./v12-0002-GIST-Fix-visibility-issues-in-IOS.patch ===
Applied patch to 'src/backend/access/gist/gistget.c' cleanly.
Applied patch to 'src/backend/access/gist/gistscan.c' cleanly.
Applied patch to 'src/backend/access/gist/gistvacuum.c' with conflicts.
Applied patch to 'src/include/access/gist_private.h' cleanly.
U src/backend/access/gist/gistvacuum.c
diff --cc src/backend/access/gist/gistvacuum.c
index b925eda2b9b,d0b8afc252f..00000000000
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@@ -326,11 -325,11 +326,16 @@@ restart
  	recurse_to = InvalidBlockNumber;
  
  	/*
- 	 * We are not going to stay here for a long time, aggressively grab an
- 	 * exclusive lock.
+ 	 * We are not going to stay here for a long time, aggressively grab a
+ 	 * cleanup lock.
  	 */
++<<<<<<< ours
 +	LockBuffer(buffer, GIST_EXCLUSIVE);
 +	page = BufferGetPage(buffer);
++=======
+ 	LockBufferForCleanup(buffer);
+ 	page = (Page) BufferGetPage(buffer);
++>>>>>>> theirs
  
  	if (gistPageRecyclable(page))
  	{