=== Applying patches on top of PostgreSQL commit ID 43493cceda2fb75e07a63cec46000407661d505d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 17:43:28 UTC 2025
On branch cf/4709
nothing to commit, working tree clean
=== applying patch ./v7-0001-SLRU-header.patch
/work/patches/./v7-0001-SLRU-header.patch:273: indent with spaces.
                                 TransactionId *subxids, TimestampTz ts,
/work/patches/./v7-0001-SLRU-header.patch:274: indent with spaces.
                                 RepOriginId nodeid, int64 pageno);
/work/patches/./v7-0001-SLRU-header.patch:277: indent with spaces.
                                     RepOriginId nodeid, int slotno);
/work/patches/./v7-0001-SLRU-header.patch:369: indent with spaces.
                                    TransactionId *subxids,
/work/patches/./v7-0001-SLRU-header.patch:370: indent with spaces.
                                    TimestampTz timestamp, RepOriginId nodeid) {
Applied patch to 'src/backend/access/transam/clog.c' cleanly.
Applied patch to 'src/backend/access/transam/commit_ts.c' cleanly.
Applied patch to 'src/backend/access/transam/multixact.c' cleanly.
Applied patch to 'src/backend/access/transam/slru.c' cleanly.
Applied patch to 'src/backend/access/transam/subtrans.c' cleanly.
Applied patch to 'src/backend/commands/async.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/predicate.c' cleanly.
Applied patch to 'src/backend/storage/page/bufpage.c' cleanly.
Applied patch to 'src/bin/pg_checksums/pg_checksums.c' cleanly.
Applied patch to 'src/bin/pg_resetwal/t/001_basic.pl' with conflicts.
Applied patch to 'src/bin/pg_upgrade/file.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.h' cleanly.
Applied patch to 'src/include/storage/bufpage.h' with conflicts.
Applied patch to 'src/test/modules/test_slru/test_slru.c' cleanly.
U src/bin/pg_resetwal/t/001_basic.pl
U src/include/storage/bufpage.h
warning: squelched 161 whitespace errors
warning: 166 lines add whitespace errors.
diff --cc src/bin/pg_resetwal/t/001_basic.pl
index 323cd483cf,7b9e034e19..0000000000
--- a/src/bin/pg_resetwal/t/001_basic.pl
+++ b/src/bin/pg_resetwal/t/001_basic.pl
@@@ -207,29 -206,27 +207,41 @@@ push @cmd
    sprintf("%d,%d", hex($files[0]) == 0 ? 3 : hex($files[0]), hex($files[-1]));
  
  @files = get_slru_files('pg_multixact/offsets');
++<<<<<<< ours
 +$mult = 32 * $blcksz / 4;
 +# --multixact-ids argument is "new,old"
 +push @cmd,
 +  '--multixact-ids' => sprintf("%d,%d",
++=======
+ $mult = 32 * ($blcksz - 24) / 4;
+ # -m argument is "new,old"
+ push @cmd, '-m',
+   sprintf("%d,%d",
++>>>>>>> theirs
  	(hex($files[-1]) + 1) * $mult,
  	hex($files[0]) == 0 ? 1 : hex($files[0] * $mult));
  
  @files = get_slru_files('pg_multixact/members');
++<<<<<<< ours
 +$mult = 32 * int($blcksz / 20) * 4;
 +push @cmd, '--multixact-offset' => (hex($files[-1]) + 1) * $mult;
++=======
+ $mult = 32 * int(($blcksz - 24) / 20) * 4;
+ push @cmd, '-O', (hex($files[-1]) + 1) * $mult;
++>>>>>>> theirs
  
  @files = get_slru_files('pg_xact');
- $mult = 32 * $blcksz * 4;
+ $mult = 32 * ($blcksz - 24) * 4;
  push @cmd,
 -  '-u', (hex($files[0]) == 0 ? 3 : hex($files[0]) * $mult),
 -  '-x', ((hex($files[-1]) + 1) * $mult);
 +  '--oldest-transaction-id' =>
 +  (hex($files[0]) == 0 ? 3 : hex($files[0]) * $mult),
 +  '--next-transaction-id' => ((hex($files[-1]) + 1) * $mult);
  
 -command_ok([ @cmd, '-n' ], 'runs with control override options, dry run');
 +command_ok([ @cmd, '--dry-run' ],
 +	'runs with control override options, dry run');
  command_ok(\@cmd, 'runs with control override options');
  command_like(
 -	[ 'pg_resetwal', '-n', $node->data_dir ],
 +	[ 'pg_resetwal', '--dry-run', $node->data_dir ],
  	qr/^Latest checkpoint's NextOID: *100000$/m,
  	'spot check that control changes were applied');
  
diff --cc src/include/storage/bufpage.h
index d06208b7ce,f6662ee226..0000000000
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@@ -489,12 -495,13 +495,17 @@@ StaticAssertDecl(BLCKSZ == ((BLCKSZ / s
  				 "BLCKSZ has to be a multiple of sizeof(size_t)");
  
  extern void PageInit(Page page, Size pageSize, Size specialSize);
++<<<<<<< ours
 +extern bool PageIsVerifiedExtended(const PageData *page, BlockNumber blkno, int flags);
++=======
+ extern void PageInitSLRU(Page page, Size pageSize, Size specialSize);
+ extern bool PageIsVerifiedExtended(Page page, BlockNumber blkno, int flags);
++>>>>>>> theirs
  extern OffsetNumber PageAddItemExtended(Page page, Item item, Size size,
  										OffsetNumber offsetNumber, int flags);
 -extern Page PageGetTempPage(Page page);
 -extern Page PageGetTempPageCopy(Page page);
 -extern Page PageGetTempPageCopySpecial(Page page);
 +extern Page PageGetTempPage(const PageData *page);
 +extern Page PageGetTempPageCopy(const PageData *page);
 +extern Page PageGetTempPageCopySpecial(const PageData *page);
  extern void PageRestoreTempPage(Page tempPage, Page oldPage);
  extern void PageRepairFragmentation(Page page);
  extern void PageTruncateLinePointerArray(Page page);