=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 04:25:32 UTC 2025
On branch cf/3998
nothing to commit, working tree clean
=== applying patch ./v5-0001-Remove-LOCK_PRINT-call-that-could-point-to-garbag.patch
Applied patch to 'src/backend/storage/lmgr/lock.c' with conflicts.
U src/backend/storage/lmgr/lock.c
diff --cc src/backend/storage/lmgr/lock.c
index 11b4d1085b,4d2b510835..0000000000
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@@ -1909,7 -1847,28 +1909,32 @@@ WaitOnLock(LOCALLOCK *locallock, Resour
  	 */
  	PG_TRY();
  	{
++<<<<<<< ours
 +		result = ProcSleep(locallock);
++=======
+ 		/*
+ 		 * If dontWait = true, we handle success and failure in the same way
+ 		 * here. The caller will be able to sort out what has happened.
+ 		 */
+ 		if (ProcSleep(locallock, lockMethodTable, dontWait) != PROC_WAIT_STATUS_OK
+ 			&& !dontWait)
+ 		{
+ 
+ 			/*
+ 			 * We failed as a result of a deadlock, see CheckDeadLock(). Quit
+ 			 * now.
+ 			 */
+ 			awaitedLock = NULL;
+ 			LWLockRelease(LockHashPartitionLock(locallock->hashcode));
+ 
+ 			/*
+ 			 * Now that we aren't holding the partition lock, we can give an
+ 			 * error report including details about the detected deadlock.
+ 			 */
+ 			DeadLockReport();
+ 			/* not reached */
+ 		}
++>>>>>>> theirs
  	}
  	PG_CATCH();
  	{