=== Applying patches on top of PostgreSQL commit ID 2c53dec7f4407c022f8b83e1a63fe0ae1bbb4dc2 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Feb 20 21:04:25 UTC 2025
On branch cf/5570
nothing to commit, working tree clean
=== applying patch ./v3-0001-Bump-pgbench-soft-open-file-limit-RLIMIT_NOFILE-t.patch
Applied patch to 'src/bin/pgbench/pgbench.c' with conflicts.
U src/bin/pgbench/pgbench.c
diff --cc src/bin/pgbench/pgbench.c
index fdc957fa34,8f53bf50ab..0000000000
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@@ -6829,7 -6829,7 +6829,11 @@@ main(int argc, char **argv
  					rlim.rlim_cur = nclients + 3;
  					if (setrlimit(RLIMIT_NOFILE, &rlim) == -1)
  					{
++<<<<<<< ours
 +						pg_log_error("need at least %d open files, but couldn't raise the limit: %m",
++=======
+ 						pg_log_error("need at least %d open files, but couldn't raise the limit",
++>>>>>>> theirs
  									 nclients + 3);
  						pg_log_error_hint("Reduce number of clients, or use limit/ulimit to increase the system limit.");
  						exit(1);