=== Applying patches on top of PostgreSQL commit ID 72a3d0462b9a7f6265267950668af0c0246e7c01 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 12 10:44:29 UTC 2025
On branch cf/5319
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Allow-to-use-multiple-shared-memory-mapping-20250228.patch ===
Applying: Allow to use multiple shared memory mappings
Using index info to reconstruct a base tree...
M	src/backend/storage/lmgr/lwlock.c
M	src/include/storage/buf_internals.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/storage/buf_internals.h
Auto-merging src/backend/storage/lmgr/lwlock.c
CONFLICT (content): Merge conflict in src/backend/storage/lmgr/lwlock.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 Allow to use multiple shared memory mappings
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/port/posix_sema.c
M	src/backend/port/sysv_sema.c
M	src/backend/port/sysv_shmem.c
M	src/backend/port/win32_sema.c
M	src/backend/storage/ipc/ipc.c
M	src/backend/storage/ipc/ipci.c
M	src/backend/storage/ipc/shmem.c
M	src/backend/storage/lmgr/lwlock.c
M	src/include/storage/buf_internals.h
M	src/include/storage/ipc.h
M	src/include/storage/pg_sema.h
M	src/include/storage/pg_shmem.h
M	src/include/storage/shmem.h
=== using patch(1) to apply patch ./0001-Allow-to-use-multiple-shared-memory-mapping-20250228.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./0001-Allow-to-use-multiple-shared-memory-mapping-20250228.patch ===
Applied patch to 'src/backend/port/posix_sema.c' cleanly.
Applied patch to 'src/backend/port/sysv_sema.c' cleanly.
Applied patch to 'src/backend/port/sysv_shmem.c' cleanly.
Applied patch to 'src/backend/port/win32_sema.c' cleanly.
Applied patch to 'src/backend/storage/ipc/ipc.c' cleanly.
Applied patch to 'src/backend/storage/ipc/ipci.c' cleanly.
Applied patch to 'src/backend/storage/ipc/shmem.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/lwlock.c' with conflicts.
Applied patch to 'src/include/storage/buf_internals.h' cleanly.
Applied patch to 'src/include/storage/ipc.h' cleanly.
Applied patch to 'src/include/storage/pg_sema.h' cleanly.
Applied patch to 'src/include/storage/pg_shmem.h' cleanly.
Applied patch to 'src/include/storage/shmem.h' cleanly.
U src/backend/storage/lmgr/lwlock.c
diff --cc src/backend/storage/lmgr/lwlock.c
index 5702c35bb91,40aa4014b5f..00000000000
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@@ -80,9 -80,10 +80,14 @@@
  #include "pg_trace.h"
  #include "pgstat.h"
  #include "port/pg_bitutils.h"
++<<<<<<< ours
++=======
+ #include "postmaster/postmaster.h"
+ #include "storage/pg_shmem.h"
++>>>>>>> theirs
  #include "storage/proc.h"
  #include "storage/proclist.h"
 +#include "storage/procnumber.h"
  #include "storage/spin.h"
  #include "utils/memutils.h"