=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 06:52:31 UTC 2025
On branch cf/5046
nothing to commit, working tree clean
=== applying patch ./v6-0001-Introduce-autovacuum_vacuum_max_threshold.patch
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'doc/src/sgml/maintenance.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/create_table.sgml' cleanly.
Applied patch to 'src/backend/access/common/reloptions.c' cleanly.
Applied patch to 'src/backend/postmaster/autovacuum.c' 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/bin/psql/tab-complete.in.c' cleanly.
Applied patch to 'src/include/postmaster/autovacuum.h' cleanly.
Applied patch to 'src/include/utils/rel.h' cleanly.
U src/backend/utils/misc/guc_tables.c
diff --cc src/backend/utils/misc/guc_tables.c
index 0bdfc83907,7270abbc64..0000000000
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@@ -3427,7 -3426,16 +3427,20 @@@ struct config_int ConfigureNamesInt[] 
  		NULL, NULL, NULL
  	},
  	{
++<<<<<<< ours
 +		{"autovacuum_vacuum_insert_threshold", PGC_SIGHUP, VACUUM_AUTOVACUUM,
++=======
+ 		{"autovacuum_vacuum_max_threshold", PGC_SIGHUP, AUTOVACUUM,
+ 			gettext_noop("Maximum number of tuple updates or deletes prior to vacuum."),
+ 			NULL
+ 		},
+ 		&autovacuum_vac_max_thresh,
+ 		100000000, -1, INT_MAX,
+ 		NULL, NULL, NULL
+ 	},
+ 	{
+ 		{"autovacuum_vacuum_insert_threshold", PGC_SIGHUP, AUTOVACUUM,
++>>>>>>> theirs
  			gettext_noop("Minimum number of tuple inserts prior to vacuum, or -1 to disable insert vacuums."),
  			NULL
  		},