=== Applying patches on top of PostgreSQL commit ID 79e872fedb4d2f73baa0a80ba572480774edc61b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 07:55:32 UTC 2025
On branch cf/5227
nothing to commit, working tree clean
=== applying patch ./v2.3-0001-checkpointer-Request-checkpoint-via-latch-inste.patch
Applied patch to 'src/backend/postmaster/checkpointer.c' with conflicts.
U src/backend/postmaster/checkpointer.c
diff --cc src/backend/postmaster/checkpointer.c
index b94f9cdff2,dd2c8376c6..0000000000
--- a/src/backend/postmaster/checkpointer.c
+++ b/src/backend/postmaster/checkpointer.c
@@@ -164,9 -159,6 +164,12 @@@ static bool ImmediateCheckpointRequeste
  static bool CompactCheckpointerRequestQueue(void);
  static void UpdateSharedMemoryConfig(void);
  
++<<<<<<< ours
 +/* Signal handlers */
 +static void ReqShutdownXLOG(SIGNAL_ARGS);
 +
++=======
++>>>>>>> theirs
  
  /*
   * Main entry point for checkpointer process
@@@ -196,7 -188,7 +199,11 @@@ CheckpointerMain(char *startup_data, si
  	 * tell us it's okay to shut down (via SIGUSR2).
  	 */
  	pqsignal(SIGHUP, SignalHandlerForConfigReload);
++<<<<<<< ours
 +	pqsignal(SIGINT, ReqShutdownXLOG);
++=======
+ 	pqsignal(SIGINT, SIG_IGN);
++>>>>>>> theirs
  	pqsignal(SIGTERM, SIG_IGN); /* ignore SIGTERM */
  	/* SIGQUIT handler was already set up by InitPostmasterChild */
  	pqsignal(SIGALRM, SIG_IGN);
@@@ -907,20 -858,6 +914,23 @@@ IsCheckpointOnSchedule(double progress
  
  
  /* --------------------------------
++<<<<<<< ours
 + *		signal handler routines
 + * --------------------------------
 + */
 +
 +/* SIGINT: set flag to trigger writing of shutdown checkpoint */
 +static void
 +ReqShutdownXLOG(SIGNAL_ARGS)
 +{
 +	ShutdownXLOGPending = true;
 +	SetLatch(MyLatch);
 +}
 +
 +
 +/* --------------------------------
++=======
++>>>>>>> theirs
   *		communication with backends
   * --------------------------------
   */