=== Applying patches on top of PostgreSQL commit ID 3aad76a0a970faf22ea38dd61b5668d480b5a92f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Apr 19 03:47:23 UTC 2025
On branch cf/5633
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-Lock-free-XLog-Reservation-using-lock-free-hash-t.patch ===
Applying: Lock-free XLog Reservation using lock-free hash-table
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.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 Lock-free XLog Reservation using lock-free hash-table
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/access/transam/xlog.c
M	src/tools/pgindent/typedefs.list
=== using patch(1) to apply patch ./v5-0001-Lock-free-XLog-Reservation-using-lock-free-hash-t.patch ===
patching file src/backend/access/transam/xlog.c
Hunk #2 succeeded at 381 (offset -5 lines).
Hunk #3 succeeded at 480 (offset -5 lines).
Hunk #4 succeeded at 528 (offset -5 lines).
Hunk #5 succeeded at 699 (offset 11 lines).
Hunk #6 succeeded at 834 (offset 11 lines).
Hunk #7 succeeded at 1233 (offset 11 lines).
Hunk #8 succeeded at 1600 (offset 11 lines).
Hunk #9 succeeded at 1638 (offset 11 lines).
Hunk #10 succeeded at 1666 (offset 11 lines).
Hunk #11 succeeded at 1980 (offset 11 lines).
Hunk #12 succeeded at 1994 (offset 11 lines).
Hunk #13 succeeded at 5538 (offset 135 lines).
Hunk #14 succeeded at 5594 (offset 135 lines).
Hunk #15 succeeded at 5642 (offset 135 lines).
Hunk #16 FAILED at 5528.
Hunk #17 succeeded at 6668 (offset 139 lines).
Hunk #18 succeeded at 7663 (offset 142 lines).
Hunk #19 succeeded at 10081 (offset 142 lines).
1 out of 19 hunks FAILED -- saving rejects to file src/backend/access/transam/xlog.c.rej
patching file src/tools/pgindent/typedefs.list
Hunk #1 succeeded at 3211 (offset 31 lines).
Unstaged changes after reset:
M	src/backend/access/transam/xlog.c
M	src/tools/pgindent/typedefs.list
Removing src/backend/access/transam/xlog.c.rej
=== using 'git apply' to apply patch ./v5-0001-Lock-free-XLog-Reservation-using-lock-free-hash-t.patch ===
Applied patch to 'src/backend/access/transam/xlog.c' with conflicts.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/backend/access/transam/xlog.c
diff --cc src/backend/access/transam/xlog.c
index ec40c0b7c42,82d6dc0732c..00000000000
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@@ -5205,9 -5534,18 +5669,24 @@@ XLOGShmemInit(void
  	pg_atomic_init_u64(&XLogCtl->logFlushResult, InvalidXLogRecPtr);
  	pg_atomic_init_u64(&XLogCtl->unloggedLSN, InvalidXLogRecPtr);
  
++<<<<<<< ours
 +	pg_atomic_init_u64(&XLogCtl->InitializeReserved, InvalidXLogRecPtr);
 +	pg_atomic_init_u64(&XLogCtl->InitializedUpTo, InvalidXLogRecPtr);
 +	ConditionVariableInit(&XLogCtl->InitializedUpToCondVar);
++=======
+ 	pg_atomic_init_u64(&XLogCtl->Insert.CurrBytePos, 0);
+ 
+ 	for (i = 0; i < PREV_LINKS_HASH_CAPA; i++)
+ 	{
+ #if WAL_LINK_64
+ 		pg_atomic_init_u64(&PrevLinksHash[i].CurrPos, 0);
+ 		pg_atomic_init_u64(&PrevLinksHash[i].PrevPos, WAL_PREV_EMPTY);
+ #else
+ 		pg_atomic_init_u32(&PrevLinksHash[i].CurrPosId, 0);
+ 		pg_atomic_init_u32(&PrevLinksHash[i].PrevSize, 0);
+ #endif
+ 	}
++>>>>>>> theirs
  }
  
  /*