=== Applying patches on top of PostgreSQL commit ID 80d7f990496b1c7be61d9a00a2635b7d96b96197 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Feb 19 13:03:23 UTC 2025
On branch cf/5447
nothing to commit, working tree clean
=== applying patch ./v1-0001-log_min_messages-per-backend-type.patch
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/commands/extension.c' cleanly.
Applied patch to 'src/backend/commands/variable.c' cleanly.
Applied patch to 'src/backend/utils/error/elog.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/miscadmin.h' cleanly.
Applied patch to 'src/include/utils/guc.h' cleanly.
Applied patch to 'src/include/utils/guc_hooks.h' with conflicts.
Applied patch to 'src/include/utils/guc_tables.h' cleanly.
Applied patch to 'src/test/regress/expected/guc.out' cleanly.
Applied patch to 'src/test/regress/sql/guc.sql' cleanly.
U src/include/utils/guc_hooks.h
diff --cc src/include/utils/guc_hooks.h
index 951451a976,4b59034261..0000000000
--- a/src/include/utils/guc_hooks.h
+++ b/src/include/utils/guc_hooks.h
@@@ -174,7 -174,7 +174,12 @@@ extern void assign_wal_sync_method(int 
  extern bool check_synchronized_standby_slots(char **newval, void **extra,
  											 GucSource source);
  extern void assign_synchronized_standby_slots(const char *newval, void *extra);
++<<<<<<< ours
 +extern bool check_idle_replication_slot_timeout(int *newval, void **extra,
 +												GucSource source);
++=======
+ extern bool check_log_min_messages(char **newval, void **extra, GucSource source);
+ extern void assign_log_min_messages(const char *newval, void *extra);
++>>>>>>> theirs
  
  #endif							/* GUC_HOOKS_H */