=== Applying patches on top of PostgreSQL commit ID a9afa021e95f2b0ffaaf26f3a27e685f634f4ac9 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Feb  2 04:00:30 UTC 2026
On branch cf/5617
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Improve-API-for-retrieving-data-from-read-streams.patch ===
Applying: Improve API for retrieving data from read streams.
Using index info to reconstruct a base tree...
M	contrib/pg_prewarm/pg_prewarm.c
M	contrib/pg_visibility/pg_visibility.c
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/storage/aio/read_stream.c
M	src/backend/storage/buffer/bufmgr.c
M	src/include/storage/read_stream.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/storage/read_stream.h
Auto-merging src/backend/storage/buffer/bufmgr.c
Auto-merging src/backend/storage/aio/read_stream.c
Auto-merging src/backend/access/heap/vacuumlazy.c
CONFLICT (content): Merge conflict in src/backend/access/heap/vacuumlazy.c
Auto-merging src/backend/access/heap/heapam_handler.c
Auto-merging src/backend/access/heap/heapam.c
Auto-merging contrib/pg_visibility/pg_visibility.c
Auto-merging contrib/pg_prewarm/pg_prewarm.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 Improve API for retrieving data from read streams.
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	contrib/pg_prewarm/pg_prewarm.c
M	contrib/pg_visibility/pg_visibility.c
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/storage/aio/read_stream.c
M	src/backend/storage/buffer/bufmgr.c
M	src/include/storage/read_stream.h
=== using patch(1) to apply patch ./v2-0001-Improve-API-for-retrieving-data-from-read-streams.patch ===
patching file contrib/pg_prewarm/pg_prewarm.c
Hunk #1 succeeded at 263 (offset 55 lines).
patching file contrib/pg_visibility/pg_visibility.c
Hunk #1 succeeded at 544 (offset -12 lines).
Hunk #2 succeeded at 557 (offset -12 lines).
Hunk #3 succeeded at 740 (offset -12 lines).
patching file src/backend/access/heap/heapam.c
Hunk #1 succeeded at 735 (offset 126 lines).
patching file src/backend/access/heap/heapam_handler.c
Hunk #1 succeeded at 1028 (offset 18 lines).
patching file src/backend/access/heap/vacuumlazy.c
Hunk #1 succeeded at 1296 with fuzz 2 (offset 66 lines).
Hunk #2 FAILED at 1286.
Hunk #3 succeeded at 2798 (offset 59 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/backend/access/heap/vacuumlazy.c.rej
patching file src/backend/storage/aio/read_stream.c
Hunk #1 succeeded at 786 (offset 171 lines).
Hunk #2 succeeded at 1037 (offset 194 lines).
patching file src/backend/storage/buffer/bufmgr.c
Hunk #1 succeeded at 5330 (offset 640 lines).
Hunk #2 succeeded at 5355 (offset 640 lines).
patching file src/include/storage/read_stream.h
Hunk #1 succeeded at 91 (offset 21 lines).
Hunk #2 succeeded at 103 (offset 21 lines).
Unstaged changes after reset:
M	contrib/pg_prewarm/pg_prewarm.c
M	contrib/pg_visibility/pg_visibility.c
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/storage/aio/read_stream.c
M	src/backend/storage/buffer/bufmgr.c
M	src/include/storage/read_stream.h
Removing src/backend/access/heap/vacuumlazy.c.rej
=== using 'git apply' to apply patch ./v2-0001-Improve-API-for-retrieving-data-from-read-streams.patch ===
Applied patch to 'contrib/pg_prewarm/pg_prewarm.c' cleanly.
Applied patch to 'contrib/pg_visibility/pg_visibility.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly.
Applied patch to 'src/backend/access/heap/vacuumlazy.c' with conflicts.
Applied patch to 'src/backend/storage/aio/read_stream.c' cleanly.
Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly.
Applied patch to 'src/include/storage/read_stream.h' cleanly.
U src/backend/access/heap/vacuumlazy.c
diff --cc src/backend/access/heap/vacuumlazy.c
index 4be267ff657,ac7a4d8c21d..00000000000
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@@ -1293,10 -1228,8 +1293,9 @@@ lazy_scan_heap(LVRelState *vacrel
  	{
  		Buffer		buf;
  		Page		page;
 -		uint8		blk_info = 0;
 +		bool		was_eager_scanned = false;
 +		int			ndeleted = 0;
  		bool		has_lpdead_items;
- 		void	   *per_buffer_data = NULL;
  		bool		vm_page_frozen = false;
  		bool		got_cleanup_lock = false;
  
@@@ -1362,7 -1292,6 +1361,10 @@@
  		if (!BufferIsValid(buf))
  			break;
  
++<<<<<<< ours
 +		was_eager_scanned = *((bool *) per_buffer_data);
++=======
++>>>>>>> theirs
  		CheckBufferIsPinnedOnce(buf);
  		page = BufferGetPage(buf);
  		blkno = BufferGetBlockNumber(buf);