=== Applying patches on top of PostgreSQL commit ID 9cfd19bc10ac07139ca6c6d051d4492764441edb ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jul  2 13:45:32 UTC 2026
On branch cf/6974
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-typo-in-pg_stat_us_to_ms.patch ===
Applying: Fix typo in pg_stat_us_to_ms()
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/pgstatfuncs.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/pgstatfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/pgstatfuncs.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 Fix typo in pg_stat_us_to_ms()
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".
=== using patch(1) to apply patch ./v1-0001-Fix-typo-in-pg_stat_us_to_ms.patch ===
patching file src/backend/utils/adt/pgstatfuncs.c
Hunk #1 FAILED at 1455.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/pgstatfuncs.c.rej
Removing src/backend/utils/adt/pgstatfuncs.c.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-typo-in-pg_stat_us_to_ms.patch ===
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' with conflicts.
U src/backend/utils/adt/pgstatfuncs.c
diff --cc src/backend/utils/adt/pgstatfuncs.c
index 6f9c9c72de5,565d0e70768..00000000000
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@@ -1455,9 -1455,9 +1455,13 @@@ pgstat_get_io_time_index(IOOp io_op
  }
  
  static inline double
- pg_stat_us_to_ms(PgStat_Counter val_ms)
+ pg_stat_us_to_ms(PgStat_Counter val_us)
  {
++<<<<<<< ours
 +	return val_ms * (double) 0.001;
++=======
+ 	return (double) val_us / 1000.0;
++>>>>>>> theirs
  }
  
  /*