=== Applying patches on top of PostgreSQL commit ID e28033fe1af8037e0fec8bb3a32fabbe18ac06b1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jan  2 13:07:23 UTC 2025
On branch cf/5081
nothing to commit, working tree clean
=== applying patch ./v19-0001-Show-index-search-count-in-EXPLAIN-ANALYZE.patch
Applied patch to 'src/include/access/relscan.h' cleanly.
Applied patch to 'src/backend/access/brin/brin.c' cleanly.
Applied patch to 'src/backend/access/gin/ginscan.c' cleanly.
Applied patch to 'src/backend/access/gist/gistget.c' cleanly.
Applied patch to 'src/backend/access/hash/hashsearch.c' cleanly.
Applied patch to 'src/backend/access/index/genam.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtree.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtsearch.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgscan.c' cleanly.
Applied patch to 'src/backend/commands/explain.c' cleanly.
Applied patch to 'contrib/bloom/blscan.c' cleanly.
Applied patch to 'doc/src/sgml/bloom.sgml' cleanly.
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'doc/src/sgml/perform.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/explain.sgml' cleanly.
Applied patch to 'doc/src/sgml/rules.sgml' cleanly.
Applied patch to 'src/test/regress/expected/brin_multi.out' cleanly.
Applied patch to 'src/test/regress/expected/memoize.out' cleanly.
Applied patch to 'src/test/regress/expected/partition_prune.out' cleanly.
Applied patch to 'src/test/regress/expected/select.out' cleanly.
Applied patch to 'src/test/regress/sql/memoize.sql' cleanly.
Applied patch to 'src/test/regress/sql/partition_prune.sql' cleanly.
[cf/5081 968a17c0d1] Show index search count in EXPLAIN ANALYZE.
 Author: Peter Geoghegan <pg@bowt.ie>
 Date: Wed Aug 14 13:50:23 2024 -0400
 22 files changed, 244 insertions(+), 46 deletions(-)
=== applying patch ./v19-0002-Add-skip-scan-to-nbtree.patch
Applied patch to 'src/include/access/amapi.h' cleanly.
Applied patch to 'src/include/access/nbtree.h' cleanly.
Applied patch to 'src/include/catalog/pg_amproc.dat' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/storage/lwlock.h' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/access/index/indexam.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtcompare.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtree.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtsearch.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtutils.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtvalidate.c' cleanly.
Applied patch to 'src/backend/commands/opclasscmds.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/lwlock.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly.
Applied patch to 'src/backend/utils/adt/Makefile' cleanly.
Applied patch to 'src/backend/utils/adt/date.c' cleanly.
Applied patch to 'src/backend/utils/adt/meson.build' cleanly.
Applied patch to 'src/backend/utils/adt/selfuncs.c' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/utils/adt/timestamp.c' cleanly.
Applied patch to 'src/backend/utils/adt/uuid.c' with conflicts.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'doc/src/sgml/btree.sgml' cleanly.
Applied patch to 'doc/src/sgml/indexam.sgml' cleanly.
Applied patch to 'doc/src/sgml/indices.sgml' cleanly.
Applied patch to 'doc/src/sgml/xindex.sgml' cleanly.
Applied patch to 'src/test/regress/expected/alter_generic.out' cleanly.
Applied patch to 'src/test/regress/expected/create_index.out' cleanly.
Applied patch to 'src/test/regress/expected/join.out' cleanly.
Applied patch to 'src/test/regress/expected/psql.out' cleanly.
Applied patch to 'src/test/regress/expected/union.out' cleanly.
Applied patch to 'src/test/regress/sql/alter_generic.sql' cleanly.
Applied patch to 'src/test/regress/sql/create_index.sql' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/backend/utils/adt/uuid.c
diff --cc src/backend/utils/adt/uuid.c
index 4f8402ef92,654bda6385..0000000000
--- a/src/backend/utils/adt/uuid.c
+++ b/src/backend/utils/adt/uuid.c
@@@ -13,7 -13,7 +13,11 @@@
  
  #include "postgres.h"
  
++<<<<<<< ours
 +#include <time.h>				/* for clock_gettime() */
++=======
+ #include <limits.h>
++>>>>>>> theirs
  
  #include "common/hashfn.h"
  #include "lib/hyperloglog.h"