=== 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 15:44:25 UTC 2026
On branch cf/6487
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Pipelined-Recoveries.patch ===
Applying: Pipelined Recoveries
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogprefetcher.c
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/postmaster/bgworker.c
M	src/backend/storage/ipc/ipci.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/include/access/xlogrecovery.h
M	src/include/utils/guc.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/guc.h
Auto-merging src/include/access/xlogrecovery.h
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/storage/ipc/ipci.c
Auto-merging src/backend/postmaster/bgworker.c
CONFLICT (content): Merge conflict in src/backend/postmaster/bgworker.c
Auto-merging src/backend/access/transam/xlogrecovery.c
Auto-merging src/backend/access/transam/xlogprefetcher.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 Pipelined Recoveries
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/transam/Makefile
M	src/backend/access/transam/xlogprefetcher.c
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/postmaster/bgworker.c
M	src/backend/storage/ipc/ipci.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/include/access/xlogrecovery.h
M	src/include/utils/guc.h
Removing src/backend/access/transam/wal_pipeline.c
Removing src/include/access/wal_pipeline.h
=== using patch(1) to apply patch ./v1-0001-Pipelined-Recoveries.patch ===
patching file src/backend/access/transam/Makefile
patching file src/backend/access/transam/wal_pipeline.c
patching file src/backend/access/transam/xlogprefetcher.c
patching file src/backend/access/transam/xlogrecovery.c
Hunk #6 succeeded at 357 (offset -64 lines).
Hunk #7 succeeded at 1597 (offset -62 lines).
Hunk #8 succeeded at 1764 (offset -62 lines).
Hunk #9 succeeded at 1905 (offset -62 lines).
Hunk #10 succeeded at 1914 (offset -62 lines).
Hunk #11 succeeded at 1951 (offset -61 lines).
Hunk #12 succeeded at 3212 (offset -61 lines).
Hunk #13 succeeded at 3220 (offset -61 lines).
Hunk #14 succeeded at 3381 (offset -61 lines).
Hunk #15 succeeded at 3393 (offset -61 lines).
patching file src/backend/postmaster/bgworker.c
Hunk #2 FAILED at 137.
1 out of 2 hunks FAILED -- saving rejects to file src/backend/postmaster/bgworker.c.rej
patching file src/backend/storage/ipc/ipci.c
Hunk #3 succeeded at 225 (offset -2 lines).
patching file src/backend/utils/misc/guc_parameters.dat
Hunk #1 succeeded at 3398 (offset 19 lines).
patching file src/include/access/wal_pipeline.h
patching file src/include/access/xlogrecovery.h
Hunk #2 succeeded at 153 (offset 67 lines).
Hunk #3 succeeded at 228 (offset 67 lines).
patching file src/include/utils/guc.h
Unstaged changes after reset:
M	src/backend/access/transam/Makefile
M	src/backend/access/transam/xlogprefetcher.c
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/postmaster/bgworker.c
M	src/backend/storage/ipc/ipci.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/include/access/xlogrecovery.h
M	src/include/utils/guc.h
Removing src/backend/access/transam/wal_pipeline.c
Removing src/backend/postmaster/bgworker.c.rej
Removing src/include/access/wal_pipeline.h
=== using 'git apply' to apply patch ./v1-0001-Pipelined-Recoveries.patch ===
Applied patch to 'src/backend/access/transam/Makefile' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/access/transam/xlogprefetcher.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Applied patch to 'src/backend/postmaster/bgworker.c' with conflicts.
Applied patch to 'src/backend/storage/ipc/ipci.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Falling back to direct application...
Applied patch to 'src/include/access/xlogrecovery.h' cleanly.
Applied patch to 'src/include/utils/guc.h' cleanly.
U src/backend/postmaster/bgworker.c
diff --cc src/backend/postmaster/bgworker.c
index 8678ea4e139,a86111e4a1f..00000000000
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@@ -120,28 -121,25 +121,35 @@@ static const struc
  
  {
  	{
 -		"ParallelWorkerMain", ParallelWorkerMain
 +		.fn_name = "ParallelWorkerMain",
 +		.fn_addr = ParallelWorkerMain
  	},
  	{
 -		"ApplyLauncherMain", ApplyLauncherMain
 +		.fn_name = "ApplyLauncherMain",
 +		.fn_addr = ApplyLauncherMain
  	},
  	{
 -		"ApplyWorkerMain", ApplyWorkerMain
 +		.fn_name = "ApplyWorkerMain",
 +		.fn_addr = ApplyWorkerMain
  	},
  	{
 -		"ParallelApplyWorkerMain", ParallelApplyWorkerMain
 +		.fn_name = "ParallelApplyWorkerMain",
 +		.fn_addr = ParallelApplyWorkerMain
  	},
  	{
 -		"TableSyncWorkerMain", TableSyncWorkerMain
 +		.fn_name = "TableSyncWorkerMain",
 +		.fn_addr = TableSyncWorkerMain
  	},
  	{
++<<<<<<< ours
 +		.fn_name = "SequenceSyncWorkerMain",
 +		.fn_addr = SequenceSyncWorkerMain
++=======
+ 		"SequenceSyncWorkerMain", SequenceSyncWorkerMain
+ 	},
+ 	{
+ 		"WalPipeline_ProducerMain", WalPipeline_ProducerMain
++>>>>>>> theirs
  	}
  };