=== Applying patches on top of PostgreSQL commit ID 11012c503759f8018d8831bc6eb1f998eba7ad25 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jan  2 06:11:25 UTC 2025
On branch cf/5309
nothing to commit, working tree clean
=== applying patch ./v5-0001-v4.patch
Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/commands/explain.c' cleanly.
Applied patch to 'src/backend/executor/instrument.c' cleanly.
Applied patch to 'src/backend/replication/syncrep.c' cleanly.
Applied patch to 'src/backend/tcop/postgres.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_wal.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly.
Applied patch to 'src/backend/utils/init/globals.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/include/access/xlog.h' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/executor/instrument.h' cleanly.
Applied patch to 'src/include/miscadmin.h' cleanly.
Applied patch to 'src/include/pgstat.h' with conflicts.
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
U src/include/pgstat.h
diff --cc src/include/pgstat.h
index 0d8427f27d,9261856786..0000000000
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@@ -267,7 -235,7 +267,11 @@@ typedef struct PgStat_TableXactStatu
   * ------------------------------------------------------------
   */
  
++<<<<<<< ours
 +#define PGSTAT_FILE_FORMAT_ID	0x01A5BCB0
++=======
+ #define PGSTAT_FILE_FORMAT_ID	0x0907AFBD
++>>>>>>> theirs
  
  typedef struct PgStat_ArchiverStats
  {