=== Applying patches on top of PostgreSQL commit ID fab5cd3dd1323f9e66efeb676c4bb212ff340204 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Dec 22 06:39:19 UTC 2025
On branch cf/6310
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-memory-allocation-formulas.patch ===
Applying: Fix memory allocation formulas
Using index info to reconstruct a base tree...
M	contrib/btree_gist/btree_utils_var.c
Falling back to patching base and 3-way merge...
Auto-merging contrib/btree_gist/btree_utils_var.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_utils_var.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 memory allocation formulas
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	contrib/btree_gist/btree_utils_var.c
M	src/bin/pg_verifybackup/pg_verifybackup.c
=== using patch(1) to apply patch ./v1-0001-Fix-memory-allocation-formulas.patch ===
patching file contrib/btree_gist/btree_utils_var.c
Hunk #1 FAILED at 476.
1 out of 1 hunk FAILED -- saving rejects to file contrib/btree_gist/btree_utils_var.c.rej
patching file src/bin/pg_verifybackup/pg_verifybackup.c
Unstaged changes after reset:
M	src/bin/pg_verifybackup/pg_verifybackup.c
Removing contrib/btree_gist/btree_utils_var.c.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-memory-allocation-formulas.patch ===
Applied patch to 'contrib/btree_gist/btree_utils_var.c' with conflicts.
Applied patch to 'src/bin/pg_verifybackup/pg_verifybackup.c' cleanly.
U contrib/btree_gist/btree_utils_var.c
diff --cc contrib/btree_gist/btree_utils_var.c
index 40e06ae4908,c2d192d424e..00000000000
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@@ -476,7 -476,7 +476,11 @@@ gbt_var_picksplit(const GistEntryVecto
  	v->spl_nleft = 0;
  	v->spl_nright = 0;
  
++<<<<<<< ours
 +	sv = palloc_array(GBT_VARKEY *, maxoff + 1);
++=======
+ 	sv = palloc(sizeof(GBT_VARKEY *) * (maxoff + 1));
++>>>>>>> theirs
  
  	/* Sort entries */