=== Applying patches on top of PostgreSQL commit ID 284925508ae685a63ee056f89a336caecab64a63 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Feb 27 06:46:22 UTC 2026 On branch cf/6061 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Add-MPTCP-protocol-support-to-server-and-libpq-on.patch === Applying: Add MPTCP protocol support to server and libpq on Linux. Using index info to reconstruct a base tree... M doc/src/sgml/libpq.sgml M src/backend/libpq/pqcomm.c M src/backend/postmaster/postmaster.c M src/backend/utils/misc/guc_parameters.dat M src/include/postmaster/postmaster.h M src/interfaces/libpq/fe-connect.c M src/interfaces/libpq/libpq-int.h Falling back to patching base and 3-way merge... Auto-merging src/interfaces/libpq/libpq-int.h Auto-merging src/interfaces/libpq/fe-connect.c Auto-merging src/include/postmaster/postmaster.h Auto-merging src/backend/utils/misc/guc_parameters.dat CONFLICT (content): Merge conflict in src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/postmaster/postmaster.c Auto-merging src/backend/libpq/pqcomm.c Auto-merging doc/src/sgml/libpq.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add MPTCP protocol support to server and libpq on Linux. 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 doc/src/sgml/libpq.sgml M src/backend/libpq/pqcomm.c M src/backend/postmaster/postmaster.c M src/backend/utils/misc/guc_parameters.dat M src/include/postmaster/postmaster.h M src/interfaces/libpq/fe-connect.c M src/interfaces/libpq/libpq-int.h === using patch(1) to apply patch ./v1-0001-Add-MPTCP-protocol-support-to-server-and-libpq-on.patch === patching file doc/src/sgml/libpq.sgml Hunk #1 succeeded at 2585 (offset 17 lines). Hunk #2 succeeded at 9216 (offset 22 lines). patching file src/backend/libpq/pqcomm.c Hunk #1 succeeded at 439 (offset 1 line). Hunk #2 succeeded at 497 (offset 1 line). Hunk #3 succeeded at 550 (offset 1 line). patching file src/backend/postmaster/postmaster.c patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 1004 with fuzz 1 (offset 653 lines). patching file src/include/postmaster/postmaster.h patching file src/interfaces/libpq/fe-connect.c Hunk #1 succeeded at 417 (offset 2 lines). Hunk #2 succeeded at 3250 (offset 10 lines). Hunk #3 succeeded at 3336 (offset 10 lines). patching file src/interfaces/libpq/libpq-int.h [cf/6061 979c65c71fd] Add MPTCP protocol support to server and libpq on Linux. Author: Jakub Wartak Date: Thu Sep 4 11:39:54 2025 +0200 7 files changed, 72 insertions(+), 2 deletions(-)