=== Applying patches on top of PostgreSQL commit ID c37b38806a1f7269a25caa9d90d67bf2da363842 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun May 24 06:42:21 UTC 2026 On branch cf/6627 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Convert-ALL-SubLinks-to-ANY-SubLinks.patch === Applying: Convert ALL SubLinks to ANY SubLinks Using index info to reconstruct a base tree... M src/backend/optimizer/prep/prepjointree.c M src/test/regress/expected/subselect.out M src/test/regress/sql/subselect.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/subselect.sql CONFLICT (content): Merge conflict in src/test/regress/sql/subselect.sql Auto-merging src/test/regress/expected/subselect.out CONFLICT (content): Merge conflict in src/test/regress/expected/subselect.out Auto-merging src/backend/optimizer/prep/prepjointree.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 Convert ALL SubLinks to ANY SubLinks 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 ./v2-0001-Convert-ALL-SubLinks-to-ANY-SubLinks.patch === patching file src/backend/optimizer/prep/prepjointree.c Hunk #3 succeeded at 643 (offset 19 lines). Hunk #4 succeeded at 662 (offset 19 lines). Hunk #5 succeeded at 881 (offset 19 lines). Hunk #6 succeeded at 1003 (offset 19 lines). Hunk #7 succeeded at 1156 (offset 19 lines). Hunk #8 succeeded at 1217 (offset 19 lines). patching file src/test/regress/expected/subselect.out Hunk #2 succeeded at 3787 with fuzz 2 (offset 23 lines). patching file src/test/regress/sql/subselect.sql Hunk #3 succeeded at 1650 with fuzz 2 (offset 14 lines). [cf/6627 7b9209ca238] Convert ALL SubLinks to ANY SubLinks Author: Richard Guo Date: Thu Feb 26 09:51:57 2026 +0900 3 files changed, 422 insertions(+), 9 deletions(-)