=== Applying patches on top of PostgreSQL commit ID f4af7849b3db1c71efdafbe7a9e37c7e7f27e006 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Mar 16 22:06:22 UTC 2026
On branch cf/6585
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Use-C11-alignas-in-typedef-definitions.patch ===
Applying: Use C11 alignas in typedef definitions
Using index info to reconstruct a base tree...
M	src/backend/storage/aio/method_io_uring.c
M	src/include/storage/proc.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/storage/proc.h
Auto-merging src/backend/storage/aio/method_io_uring.c
CONFLICT (content): Merge conflict in src/backend/storage/aio/method_io_uring.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 Use C11 alignas in typedef definitions
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/storage/aio/method_io_uring.c
=== using patch(1) to apply patch ./v1-0001-Use-C11-alignas-in-typedef-definitions.patch ===
patching file src/backend/storage/aio/method_io_uring.c
Hunk #1 FAILED at 77.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/storage/aio/method_io_uring.c.rej
patching file src/include/storage/proc.h
Hunk #1 FAILED at 180.
Hunk #2 FAILED at 375.
2 out of 2 hunks FAILED -- saving rejects to file src/include/storage/proc.h.rej
Removing src/backend/storage/aio/method_io_uring.c.rej
Removing src/include/storage/proc.h.rej
=== using 'git apply' to apply patch ./v1-0001-Use-C11-alignas-in-typedef-definitions.patch ===
Applied patch to 'src/backend/storage/aio/method_io_uring.c' with conflicts.
Applied patch to 'src/include/storage/proc.h' cleanly.
U src/backend/storage/aio/method_io_uring.c
diff --cc src/backend/storage/aio/method_io_uring.c
index 4867ded35ea,50ea9f8e51c..00000000000
--- a/src/backend/storage/aio/method_io_uring.c
+++ b/src/backend/storage/aio/method_io_uring.c
@@@ -77,9 -77,7 +77,13 @@@ const IoMethodOps pgaio_uring_ops = 
  	.wait_one = pgaio_uring_wait_one,
  };
  
++<<<<<<< ours
 +/*
 + * Per-backend state when using io_method=io_uring
 + */
++=======
+ /* Per-backend state when using io_method=io_uring */
++>>>>>>> theirs
  typedef struct PgAioUringContext
  {
  	/*