=== Applying patches on top of PostgreSQL commit ID 71f17823ba010296da9946bd906bb8bcad6325bc ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Feb 20 02:54:24 UTC 2025
On branch cf/5513
nothing to commit, working tree clean
=== applying patch ./v4-0001-Standby-mode-requested.patch
Applied patch to 'src/backend/access/transam/timeline.c' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogarchive.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogrecovery.c' with conflicts.
Applied patch to 'src/backend/replication/logical/slotsync.c' cleanly.
Applied patch to 'src/include/access/xlog_internal.h' cleanly.
Applied patch to 'src/include/access/xlogrecovery.h' cleanly.
U src/backend/access/transam/xlogrecovery.c
diff --cc src/backend/access/transam/xlogrecovery.c
index f234007d34,e75c7891fd..0000000000
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@@ -3476,8 -3437,7 +3449,12 @@@ retry
  	 * page header here for the retry. Instead, ReadPageInternal() is
  	 * responsible for the validation.
  	 */
++<<<<<<< ours
 +	if (StandbyMode &&
 +		(targetPagePtr % wal_segment_size) == 0 &&
++=======
+ 	if (InStandbyMode() &&
++>>>>>>> theirs
  		!XLogReaderValidatePageHeader(xlogreader, targetPagePtr, readBuf))
  	{
  		/*