=== Applying patches on top of PostgreSQL commit ID d3b2e5e1ab5ca3e9738d20409debfdd299e65a2e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 13 05:09:36 UTC 2025
On branch cf/5622
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-instr_time-Add-INSTR_TIME_SET_SECONDS-INSTR_TIME.patch ===
Applying: instr_time: Add INSTR_TIME_SET_SECONDS(), INSTR_TIME_IS_LT()
=== using 'git am' to apply patch ./v10-0002-wip-report-nanoseconds-in-pg_test_timing.patch ===
Applying: wip: report nanoseconds in pg_test_timing
=== using 'git am' to apply patch ./v10-0003-Use-time-stamp-counter-to-measure-time-on-Linux-.patch ===
Applying: Use time stamp counter to measure time on Linux/x86
Using index info to reconstruct a base tree...
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/utils/init/postinit.c
M	src/bin/pgbench/pgbench.c
M	src/bin/psql/startup.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/psql/startup.c
Auto-merging src/bin/pgbench/pgbench.c
Auto-merging src/backend/utils/init/postinit.c
CONFLICT (content): Merge conflict in src/backend/utils/init/postinit.c
Auto-merging src/backend/access/heap/vacuumlazy.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use time stamp counter to measure time on Linux/x86
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/executor/instrument.c
M	src/backend/utils/init/postinit.c
M	src/bin/pg_test_timing/pg_test_timing.c
M	src/bin/pgbench/pgbench.c
M	src/bin/psql/startup.c
M	src/common/Makefile
M	src/common/meson.build
M	src/include/portability/instr_time.h
Removing src/common/instr_time.c
=== using patch(1) to apply patch ./v10-0003-Use-time-stamp-counter-to-measure-time-on-Linux-.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v10-0003-Use-time-stamp-counter-to-measure-time-on-Linux-.patch ===
Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly.
Applied patch to 'src/backend/executor/instrument.c' cleanly.
Applied patch to 'src/backend/utils/init/postinit.c' with conflicts.
Applied patch to 'src/bin/pg_test_timing/pg_test_timing.c' cleanly.
Applied patch to 'src/bin/pgbench/pgbench.c' cleanly.
Applied patch to 'src/bin/psql/startup.c' cleanly.
Applied patch to 'src/common/Makefile' cleanly.
Falling back to direct application...
Applied patch to 'src/common/meson.build' cleanly.
Applied patch to 'src/include/portability/instr_time.h' cleanly.
U src/backend/utils/init/postinit.c
diff --cc src/backend/utils/init/postinit.c
index 4b2faf1ba9d,f1111f917d1..00000000000
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@@ -808,6 -785,12 +808,15 @@@ InitPostgres(const char *in_dbname, Oi
  	/* Initialize portal manager */
  	EnablePortalManager();
  
++<<<<<<< ours
++=======
+ 	/* initialize high-precision interval timing */
+ 	INSTR_TIME_INITIALIZE();
+ 
+ 	/* Initialize status reporting */
+ 	pgstat_beinit();
+ 
++>>>>>>> theirs
  	/*
  	 * Load relcache entries for the shared system catalogs.  This must create
  	 * at least entries for pg_database and catalogs used for authentication.