=== Applying patches on top of PostgreSQL commit ID b41c4308460500f2888aff9f844458915cae1798 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Jul 10 07:29:20 UTC 2025 On branch cf/4966 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Fix-memory-leak-in-_gin_parallel_merge.patch === Applying: Fix memory leak in _gin_parallel_merge Using index info to reconstruct a base tree... M src/backend/access/gin/gininsert.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/gin/gininsert.c CONFLICT (content): Merge conflict in src/backend/access/gin/gininsert.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 Fix memory leak in _gin_parallel_merge 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/gin/gininsert.c === using patch(1) to apply patch ./v1-0001-Fix-memory-leak-in-_gin_parallel_merge.patch === patching file src/backend/access/gin/gininsert.c Hunk #2 succeeded at 1690 with fuzz 2 (offset 4 lines). Hunk #3 succeeded at 1724 with fuzz 2 (offset 9 lines). [cf/4966 53df4fe2c69] Fix memory leak in _gin_parallel_merge Author: Vinod Sridharan Date: Thu Apr 17 13:51:41 2025 -0700 1 file changed, 7 insertions(+)