=== Applying patches on top of PostgreSQL commit ID 4edd6036d69ce42ac1af236f659f20daed65c8d4 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Apr  7 20:04:31 UTC 2026
On branch cf/6652
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v20260407-0003-Various-adjustments-to-resizable-shmem-acc.nocfbot.patch ===
Applying: Various adjustments to resizable shmem accounting
error: sha1 information is lacking or useless (src/backend/storage/ipc/shmem.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Various adjustments to resizable shmem accounting
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".
=== using patch(1) to apply patch ./v20260407-0003-Various-adjustments-to-resizable-shmem-acc.nocfbot.patch ===
patching file src/backend/storage/ipc/shmem.c
Hunk #1 FAILED at 108.
Hunk #2 FAILED at 192.
Hunk #3 FAILED at 371.
3 out of 3 hunks FAILED -- saving rejects to file src/backend/storage/ipc/shmem.c.rej
patching file src/include/storage/shmem.h
Hunk #1 FAILED at 58.
Hunk #2 succeeded at 67 (offset -16 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/include/storage/shmem.h.rej
Unstaged changes after reset:
M	src/include/storage/shmem.h
Removing src/backend/storage/ipc/shmem.c.rej
Removing src/include/storage/shmem.h.rej
=== using 'git apply' to apply patch ./v20260407-0003-Various-adjustments-to-resizable-shmem-acc.nocfbot.patch ===
/work/patches/./v20260407-0003-Various-adjustments-to-resizable-shmem-acc.nocfbot.patch:79: trailing whitespace.
	 * 
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
error: patch failed: src/backend/storage/ipc/shmem.c:108
error: src/backend/storage/ipc/shmem.c: patch does not apply
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
error: patch failed: src/include/storage/shmem.h:58
error: src/include/storage/shmem.h: patch does not apply