=== Applying patches on top of PostgreSQL commit ID 0eeffd31bf9bb73446387cd7eebbbf43148aa281 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb 21 23:59:24 UTC 2026
On branch cf/6505
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Add-errdetail-with-PID-and-UID-about-source-of-te.patch ===
Applying: Add errdetail() with PID and UID about source of termination signal.
Using index info to reconstruct a base tree...
M	src/backend/postmaster/bgworker.c
M	src/backend/replication/syncrep.c
M	src/backend/tcop/postgres.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/tcop/postgres.c
Auto-merging src/backend/replication/syncrep.c
Auto-merging src/backend/postmaster/bgworker.c
CONFLICT (content): Merge conflict in 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 Add errdetail() with PID and UID about source of termination signal.
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/postmaster/bgworker.c
M	src/backend/replication/syncrep.c
M	src/backend/tcop/postgres.c
M	src/backend/utils/init/globals.c
M	src/bin/psql/t/001_basic.pl
M	src/include/miscadmin.h
M	src/port/pqsignal.c
=== using patch(1) to apply patch ./v1-0001-Add-errdetail-with-PID-and-UID-about-source-of-te.patch ===
patching file src/backend/postmaster/bgworker.c
Hunk #1 FAILED at 729.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/postmaster/bgworker.c.rej
patching file src/backend/replication/syncrep.c
patching file src/backend/tcop/postgres.c
patching file src/backend/utils/init/globals.c
patching file src/bin/psql/t/001_basic.pl
patching file src/include/miscadmin.h
patching file src/port/pqsignal.c
Unstaged changes after reset:
M	src/backend/replication/syncrep.c
M	src/backend/tcop/postgres.c
M	src/backend/utils/init/globals.c
M	src/bin/psql/t/001_basic.pl
M	src/include/miscadmin.h
M	src/port/pqsignal.c
Removing src/backend/postmaster/bgworker.c.rej
=== using 'git apply' to apply patch ./v1-0001-Add-errdetail-with-PID-and-UID-about-source-of-te.patch ===
Applied patch to 'src/backend/postmaster/bgworker.c' with conflicts.
Applied patch to 'src/backend/replication/syncrep.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/bin/psql/t/001_basic.pl' cleanly.
Applied patch to 'src/include/miscadmin.h' cleanly.
Applied patch to 'src/port/pqsignal.c' cleanly.
U src/backend/postmaster/bgworker.c
diff --cc src/backend/postmaster/bgworker.c
index 8678ea4e139,20b1893533b..00000000000
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@@ -719,6 -719,24 +719,27 @@@ SanityCheckBackgroundWorker(BackgroundW
  }
  
  /*
++<<<<<<< ours
++=======
+  * Standard SIGTERM handler for background workers
+  */
+ static void
+ bgworker_die(SIGNAL_ARGS)
+ {
+ 	sigprocmask(SIG_SETMASK, &BlockSig, NULL);
+ 
+ 	ereport(FATAL,
+ 			(errcode(ERRCODE_ADMIN_SHUTDOWN),
+ 			 errmsg("terminating background worker \"%s\" due to administrator command",
+ 					MyBgworkerEntry->bgw_type),
+ 			proc_die_sender_pid == 0 ? 0 :
+ 				errdetail("signal sent by PID %d, UID %d.",
+ 					proc_die_sender_pid, proc_die_sender_uid)
+ 			));
+ }
+ 
+ /*
++>>>>>>> theirs
   * Main entry point for background worker processes.
   */
  void