=== Applying patches on top of PostgreSQL commit ID 9b0e5bd5320f95cfb35f0402c0f4bb7a1d3ecb0f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Mar 5 07:19:28 UTC 2026 On branch cf/4291 nothing to commit, working tree clean === using 'git am' to apply patch ./v10-0001-Add-a-guc-for-parallel-worker-logging.patch === Applying: Add a guc for parallel worker logging Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M src/backend/access/transam/parallel.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/access/parallel.h M src/include/utils/guc.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/guc.h Auto-merging src/include/access/parallel.h Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_tables.c CONFLICT (content): Merge conflict in src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/access/transam/parallel.c Auto-merging doc/src/sgml/config.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 a guc for parallel worker logging 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/config.sgml M src/backend/access/transam/parallel.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/access/parallel.h M src/include/utils/guc.h === using patch(1) to apply patch ./v10-0001-Add-a-guc-for-parallel-worker-logging.patch === patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 8162 (offset 96 lines). patching file src/backend/access/transam/parallel.c patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 1703 with fuzz 1 (offset 3 lines). patching file src/backend/utils/misc/guc_tables.c Hunk #2 succeeded at 502 (offset 10 lines). Hunk #3 succeeded at 561 (offset 9 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 665 (offset 19 lines). patching file src/include/access/parallel.h Hunk #1 succeeded at 55 (offset 2 lines). Hunk #2 succeeded at 86 (offset 2 lines). patching file src/include/utils/guc.h [cf/4291 cc0eda4fb9d] Add a guc for parallel worker logging Author: benoit Date: Tue Oct 8 12:39:41 2024 +0200 7 files changed, 66 insertions(+) === using 'git am' to apply patch ./v10-0002-Implements-logging-for-parallel-worker-usage-in-util.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v10-0002-Implements-logging-for-parallel-worker-usage-in-util.patch === patching file src/backend/access/brin/brin.c Hunk #1 succeeded at 2568 (offset 1 line). patching file src/backend/access/gin/gininsert.c Hunk #1 succeeded at 1112 (offset 2 lines). patching file src/backend/access/nbtree/nbtsort.c Hunk #1 succeeded at 1613 (offset 1 line). patching file src/backend/commands/vacuumparallel.c Hunk #1 succeeded at 209 (offset 1 line). Hunk #2 succeeded at 366 (offset 1 line). Hunk #3 succeeded at 444 (offset 1 line). Hunk #4 succeeded at 749 (offset 1 line). [cf/4291 508f57210d2] Implements logging for parallel worker usage in utilities Author: benoit Date: Wed Jan 29 17:10:57 2025 +0100 4 files changed, 25 insertions(+) === using 'git am' to apply patch ./v10-0003-Implements-logging-for-parallel-worker-usage-in-quer.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v10-0003-Implements-logging-for-parallel-worker-usage-in-quer.patch === patching file src/backend/executor/execMain.c [cf/4291 48f8c483a76] Implements logging for parallel worker usage in queries Author: benoit Date: Wed Jan 29 17:15:25 2025 +0100 1 file changed, 4 insertions(+)