=== Applying patches on top of PostgreSQL commit ID 3e8e05596a020f043f1efd6406e4511ea85170bd ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Oct 28 06:55:21 UTC 2025
On branch cf/5007
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Clear-padding-in-PgStat_HashKey-keys.patch ===
Applying: Clear padding in PgStat_HashKey keys
Using index info to reconstruct a base tree...
M	src/backend/utils/activity/pgstat.c
M	src/backend/utils/activity/pgstat_shmem.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/activity/pgstat_shmem.c
CONFLICT (content): Merge conflict in src/backend/utils/activity/pgstat_shmem.c
Auto-merging src/backend/utils/activity/pgstat.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 Clear padding in PgStat_HashKey keys
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/activity/pgstat.c
M	src/backend/utils/activity/pgstat_shmem.c
=== using patch(1) to apply patch ./v6-0001-Clear-padding-in-PgStat_HashKey-keys.patch ===
patching file src/backend/utils/activity/pgstat.c
Hunk #1 succeeded at 945 (offset 7 lines).
patching file src/backend/utils/activity/pgstat_shmem.c
Hunk #1 FAILED at 432.
Hunk #2 FAILED at 908.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/utils/activity/pgstat_shmem.c.rej
Unstaged changes after reset:
M	src/backend/utils/activity/pgstat.c
Removing src/backend/utils/activity/pgstat_shmem.c.rej
=== using 'git apply' to apply patch ./v6-0001-Clear-padding-in-PgStat_HashKey-keys.patch ===
Applied patch to 'src/backend/utils/activity/pgstat.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_shmem.c' with conflicts.
U src/backend/utils/activity/pgstat_shmem.c
diff --cc src/backend/utils/activity/pgstat_shmem.c
index 746e9541bf3,c1b7ff76b12..00000000000
--- a/src/backend/utils/activity/pgstat_shmem.c
+++ b/src/backend/utils/activity/pgstat_shmem.c
@@@ -469,11 -432,14 +469,21 @@@ PgStat_EntryRef 
  pgstat_get_entry_ref(PgStat_Kind kind, Oid dboid, uint64 objid, bool create,
  					 bool *created_entry)
  {
++<<<<<<< ours
 +	PgStat_HashKey key = {0};
++=======
+ 	PgStat_HashKey key;
++>>>>>>> theirs
  	PgStatShared_HashEntry *shhashent;
  	PgStatShared_Common *shheader = NULL;
  	PgStat_EntryRef *entry_ref;
  
++<<<<<<< ours
++=======
+ 	/* clear padding */
+ 	memset(&key, 0, sizeof(struct PgStat_HashKey));
+ 
++>>>>>>> theirs
  	key.kind = kind;
  	key.dboid = dboid;
  	key.objid = objid;
@@@ -1003,10 -915,13 +1013,20 @@@ pgstat_drop_database_and_contents(Oid d
  bool
  pgstat_drop_entry(PgStat_Kind kind, Oid dboid, uint64 objid)
  {
++<<<<<<< ours
 +	PgStat_HashKey key = {0};
 +	PgStatShared_HashEntry *shent;
 +	bool		freed = true;
 +
++=======
+ 	PgStat_HashKey key;
+ 	PgStatShared_HashEntry *shent;
+ 	bool		freed = true;
+ 
+ 	/* clear padding */
+ 	memset(&key, 0, sizeof(struct PgStat_HashKey));
+ 
++>>>>>>> theirs
  	key.kind = kind;
  	key.dboid = dboid;
  	key.objid = objid;