=== Applying patches on top of PostgreSQL commit ID f41d8468ddea34170fe19fdc17b5a247e7d3ac78 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 31 06:20:28 UTC 2025
On branch cf/5343
nothing to commit, working tree clean
=== applying patch ./v3-0001-work_mem_vars-limit-increased-in-64bit-Windows.patch
Applied patch to 'src/backend/access/gin/ginfast.c' cleanly.
Applied patch to 'src/backend/access/gin/ginget.c' cleanly.
Applied patch to 'src/backend/access/hash/hash.c' cleanly.
Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtpage.c' cleanly.
Applied patch to 'src/backend/commands/vacuumparallel.c' cleanly.
Applied patch to 'src/backend/executor/execUtils.c' cleanly.
Applied patch to 'src/backend/executor/nodeBitmapIndexscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeBitmapOr.c' cleanly.
Applied patch to 'src/backend/nodes/tidbitmap.c' cleanly.
Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly.
Applied patch to 'src/backend/replication/logical/reorderbuffer.c' cleanly.
Applied patch to 'src/backend/utils/misc/stack_depth.c' with conflicts.
Applied patch to 'src/backend/utils/sort/tuplestore.c' cleanly.
Applied patch to 'src/include/nodes/tidbitmap.h' cleanly.
Applied patch to 'src/include/utils/guc.h' cleanly.
U src/backend/utils/misc/stack_depth.c
diff --cc src/backend/utils/misc/stack_depth.c
index 8f7cf531fb,acdf0a155e..0000000000
--- a/src/backend/utils/misc/stack_depth.c
+++ b/src/backend/utils/misc/stack_depth.c
@@@ -26,7 -26,7 +26,11 @@@
  int			max_stack_depth = 100;
  
  /* max_stack_depth converted to bytes for speed of checking */
++<<<<<<< ours
 +static ssize_t max_stack_depth_bytes = 100 * (ssize_t) 1024;
++=======
+ static Size max_stack_depth_bytes = 100 * (Size)1024;
++>>>>>>> theirs
  
  /*
   * Stack base pointer -- initialized by set_stack_base(), which
@@@ -158,7 -158,7 +162,11 @@@ check_max_stack_depth(int *newval, voi
  void
  assign_max_stack_depth(int newval, void *extra)
  {
++<<<<<<< ours
 +	ssize_t		newval_bytes = newval * (ssize_t) 1024;
++=======
+ 	Size		newval_bytes = newval * (Size)1024;
++>>>>>>> theirs
  
  	max_stack_depth_bytes = newval_bytes;
  }