=== Applying patches on top of PostgreSQL commit ID f4af7849b3db1c71efdafbe7a9e37c7e7f27e006 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Mar 16 22:04:22 UTC 2026
On branch cf/6575
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Move-ffast-math-defense-to-float.c-and-remove-the.patch ===
Applying: Move -ffast-math defense to float.c and remove the autoconf check
Using index info to reconstruct a base tree...
M	configure
M	configure.ac
M	src/backend/utils/adt/date.c
M	src/backend/utils/adt/float.c
M	src/backend/utils/adt/timestamp.c
M	src/interfaces/ecpg/pgtypeslib/interval.c
M	src/interfaces/ecpg/pgtypeslib/timestamp.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/timestamp.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/timestamp.c
Auto-merging src/backend/utils/adt/float.c
Auto-merging src/backend/utils/adt/date.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/date.c
Auto-merging configure.ac
Auto-merging configure
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move -ffast-math defense to float.c and remove the autoconf check
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/utils/adt/date.c
M	src/backend/utils/adt/float.c
M	src/backend/utils/adt/timestamp.c
=== using patch(1) to apply patch ./v2-0001-Move-ffast-math-defense-to-float.c-and-remove-the.patch ===
patching file configure
Hunk #1 FAILED at 7700.
1 out of 1 hunk FAILED -- saving rejects to file configure.rej
patching file configure.ac
Hunk #1 FAILED at 786.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
patching file src/backend/utils/adt/date.c
Hunk #1 FAILED at 38.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/date.c.rej
patching file src/backend/utils/adt/float.c
Hunk #1 succeeded at 28 with fuzz 1.
patching file src/backend/utils/adt/timestamp.c
Hunk #1 FAILED at 40.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/timestamp.c.rej
patching file src/interfaces/ecpg/pgtypeslib/interval.c
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED -- saving rejects to file src/interfaces/ecpg/pgtypeslib/interval.c.rej
patching file src/interfaces/ecpg/pgtypeslib/timestamp.c
Hunk #1 FAILED at 7.
1 out of 1 hunk FAILED -- saving rejects to file src/interfaces/ecpg/pgtypeslib/timestamp.c.rej
Unstaged changes after reset:
M	src/backend/utils/adt/float.c
Removing configure.ac.rej
Removing configure.rej
Removing src/backend/utils/adt/date.c.rej
Removing src/backend/utils/adt/timestamp.c.rej
Removing src/interfaces/ecpg/pgtypeslib/interval.c.rej
Removing src/interfaces/ecpg/pgtypeslib/timestamp.c.rej
=== using 'git apply' to apply patch ./v2-0001-Move-ffast-math-defense-to-float.c-and-remove-the.patch ===
Applied patch to 'configure' cleanly.
Applied patch to 'configure.ac' cleanly.
Applied patch to 'src/backend/utils/adt/date.c' with conflicts.
Applied patch to 'src/backend/utils/adt/float.c' cleanly.
Applied patch to 'src/backend/utils/adt/timestamp.c' with conflicts.
Applied patch to 'src/interfaces/ecpg/pgtypeslib/interval.c' cleanly.
Applied patch to 'src/interfaces/ecpg/pgtypeslib/timestamp.c' cleanly.
U src/backend/utils/adt/date.c
U src/backend/utils/adt/timestamp.c
diff --cc src/backend/utils/adt/date.c
index 87c063fa0cd,933766ef128..00000000000
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@@ -38,7 -38,6 +38,10 @@@
  #include "utils/skipsupport.h"
  #include "utils/sortsupport.h"
  
++<<<<<<< ours
 +
++=======
++>>>>>>> theirs
  /* common code for timetypmodin and timetztypmodin */
  static int32
  anytime_typmodin(bool istz, ArrayType *ta)
diff --cc src/backend/utils/adt/timestamp.c
index 50a73fd24ec,afa15e8df08..00000000000
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@@ -40,7 -40,6 +40,10 @@@
  #include "utils/skipsupport.h"
  #include "utils/sortsupport.h"
  
++<<<<<<< ours
 +
++=======
++>>>>>>> theirs
  /* Set at postmaster start */
  TimestampTz PgStartTime;