=== Applying patches on top of PostgreSQL commit ID 499faf9063a4c5a9985d7ac657b86e8e34e02199 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Mar 18 19:18:24 UTC 2025
On branch cf/5479
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Introduce-reserved-background-worker-slots.patch ===
Applying: Introduce reserved background worker slots.
Using index info to reconstruct a base tree...
M	src/backend/postmaster/bgworker.c
M	src/backend/postmaster/pmchild.c
M	src/backend/postmaster/postmaster.c
M	src/backend/storage/lmgr/proc.c
M	src/backend/tcop/postgres.c
M	src/backend/utils/init/postinit.c
M	src/include/miscadmin.h
M	src/include/postmaster/bgworker_internals.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/postmaster/bgworker_internals.h
Auto-merging src/include/miscadmin.h
Auto-merging src/backend/utils/init/postinit.c
Auto-merging src/backend/tcop/postgres.c
Auto-merging src/backend/storage/lmgr/proc.c
Auto-merging src/backend/postmaster/postmaster.c
Auto-merging src/backend/postmaster/pmchild.c
CONFLICT (content): Merge conflict in src/backend/postmaster/pmchild.c
Auto-merging src/backend/postmaster/bgworker.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 Introduce reserved background worker slots.
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/bootstrap/bootstrap.c
M	src/backend/postmaster/bgworker.c
M	src/backend/postmaster/pmchild.c
M	src/backend/postmaster/postmaster.c
M	src/backend/storage/lmgr/proc.c
M	src/backend/tcop/postgres.c
M	src/backend/utils/init/globals.c
M	src/backend/utils/init/postinit.c
M	src/include/miscadmin.h
M	src/include/postmaster/bgworker.h
M	src/include/postmaster/bgworker_internals.h
=== using patch(1) to apply patch ./v3-0001-Introduce-reserved-background-worker-slots.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v3-0001-Introduce-reserved-background-worker-slots.patch ===
Applied patch to 'src/backend/bootstrap/bootstrap.c' cleanly.
Applied patch to 'src/backend/postmaster/bgworker.c' cleanly.
Applied patch to 'src/backend/postmaster/pmchild.c' with conflicts.
Applied patch to 'src/backend/postmaster/postmaster.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/proc.c' cleanly.
Applied patch to 'src/backend/tcop/postgres.c' cleanly.
Applied patch to 'src/backend/utils/init/globals.c' cleanly.
Applied patch to 'src/backend/utils/init/postinit.c' cleanly.
Applied patch to 'src/include/miscadmin.h' cleanly.
Applied patch to 'src/include/postmaster/bgworker.h' cleanly.
Applied patch to 'src/include/postmaster/bgworker_internals.h' cleanly.
U src/backend/postmaster/pmchild.c
diff --cc src/backend/postmaster/pmchild.c
index cde1d23a4ca,515a9fda3af..00000000000
--- a/src/backend/postmaster/pmchild.c
+++ b/src/backend/postmaster/pmchild.c
@@@ -100,8 -101,7 +101,12 @@@ InitPostmasterChildSlots(void
  	pmchild_pools[B_BACKEND].size = 2 * (MaxConnections + max_wal_senders);
  
  	pmchild_pools[B_AUTOVAC_WORKER].size = autovacuum_worker_slots;
++<<<<<<< ours
 +	pmchild_pools[B_BG_WORKER].size = max_worker_processes;
 +	pmchild_pools[B_IO_WORKER].size = MAX_IO_WORKERS;
++=======
+ 	pmchild_pools[B_BG_WORKER].size = max_worker_processes + BGWORKER_NUM_RESERVED_WORKERS;
++>>>>>>> theirs
  
  	/*
  	 * There can be only one of each of these running at a time.  They each