=== Applying patches on top of PostgreSQL commit ID 8108765f04b8dae252825123834fe350cafe174f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jul 16 22:30:33 UTC 2026
On branch cf/4291
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v11-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/utils/guc.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/guc.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".
=== using patch(1) to apply patch ./v11-0001-Add-a-guc-for-parallel-worker-logging.patch ===
patching file doc/src/sgml/config.sgml
Hunk #1 succeeded at 8420 (offset 16 lines).
patching file src/backend/access/transam/parallel.c
Hunk #1 succeeded at 1669 (offset -2 lines).
patching file src/backend/utils/misc/guc_parameters.dat
Hunk #1 succeeded at 1792 (offset 6 lines).
patching file src/backend/utils/misc/guc_tables.c
Hunk #3 FAILED at 578.
1 out of 3 hunks FAILED -- saving rejects to file src/backend/utils/misc/guc_tables.c.rej
patching file src/backend/utils/misc/postgresql.conf.sample
Hunk #1 succeeded at 683 (offset 4 lines).
patching file src/include/access/parallel.h
patching file src/include/utils/guc.h
Hunk #1 succeeded at 304 (offset 1 line).
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
Removing src/backend/utils/misc/guc_tables.c.rej
=== using 'git apply' to apply patch ./v11-0001-Add-a-guc-for-parallel-worker-logging.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/access/transam/parallel.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' with conflicts.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/access/parallel.h' cleanly.
Applied patch to 'src/include/utils/guc.h' cleanly.
U src/backend/utils/misc/guc_tables.c
diff --cc src/backend/utils/misc/guc_tables.c
index 90aa374b3ec,429a2d6e4d0..00000000000
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@@ -571,7 -578,7 +578,11 @@@ int			log_min_duration_statement = -1
  int			log_parameter_max_length = -1;
  int			log_parameter_max_length_on_error = 0;
  int			log_temp_files = -1;
++<<<<<<< ours
 +int			log_statement_max_length = -1;
++=======
+ int			log_parallel_workers = LOG_PARALLEL_WORKERS_NONE;
++>>>>>>> theirs
  double		log_statement_sample_rate = 1.0;
  double		log_xact_sample_rate = 0;
  char	   *backtrace_functions;