=== 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.
Fri Jan 31 20:48:25 UTC 2025
On branch cf/4355
nothing to commit, working tree clean
=== applying patch ./v4-0001-Add-last-commit-s-LSN-to-pg_stat_database.patch
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_database.c' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/pgstat.h' with conflicts.
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
Applied patch to 'src/test/regress/expected/stats.out' cleanly.
Applied patch to 'src/test/regress/sql/stats.sql' cleanly.
U src/include/pgstat.h
diff --cc src/include/pgstat.h
index 81ec0161c0,19ab016904..0000000000
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@@ -15,12 -14,11 +15,17 @@@
  #include "datatype/timestamp.h"
  #include "portability/instr_time.h"
  #include "postmaster/pgarch.h"	/* for MAX_XFN_CHARS */
 -#include "utils/backend_progress.h" /* for backward compatibility */
 -#include "utils/backend_status.h"	/* for backward compatibility */
 +#include "replication/conflict.h"
 +#include "utils/backend_progress.h" /* for backward compatibility */	/* IWYU pragma: export */
 +#include "utils/backend_status.h"	/* for backward compatibility */	/* IWYU pragma: export */
 +#include "utils/pgstat_kind.h"
  #include "utils/relcache.h"
++<<<<<<< ours
 +#include "utils/wait_event.h"	/* for backward compatibility */	/* IWYU pragma: export */
++=======
+ #include "utils/wait_event.h"	/* for backward compatibility */
+ #include "access/xlogdefs.h"
++>>>>>>> theirs
  
  
  /* ----------