=== Applying patches on top of PostgreSQL commit ID 9d8cdcbe0c8aee743e29079bdb2e4b5eeae4c70e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jun  9 17:40:26 UTC 2026
On branch cf/6301
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v13-0000-Replace-__builtin_types_compatible_p-with-_Gener.patch ===
Applying: Replace __builtin_types_compatible_p with _Generic
=== using 'git am' to apply patch ./v13-0001-Add-hash_make-macros.patch ===
Applying: Add hash_make macros
error: sha1 information is lacking or useless (src/include/c.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add hash_make macros
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".
=== using patch(1) to apply patch ./v13-0001-Add-hash_make-macros.patch ===
patching file doc/src/sgml/system-views.sgml
Hunk #1 FAILED at 4254.
1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/system-views.sgml.rej
patching file src/backend/utils/hash/dynahash.c
Hunk #1 succeeded at 623 (offset 2 lines).
patching file src/include/c.h
patching file src/include/storage/shmem.h
Hunk #1 succeeded at 191 (offset 151 lines).
patching file src/include/utils/hsearch.h
Hunk #4 succeeded at 279 (offset -3 lines).
patching file src/test/modules/test_cplusplusext/test_cplusplusext.cpp
patching file src/tools/pgindent/typedefs.list
Hunk #1 succeeded at 1210 (offset 23 lines).
Unstaged changes after reset:
M	src/backend/utils/hash/dynahash.c
M	src/include/c.h
M	src/include/storage/shmem.h
M	src/include/utils/hsearch.h
M	src/test/modules/test_cplusplusext/test_cplusplusext.cpp
M	src/tools/pgindent/typedefs.list
Removing doc/src/sgml/system-views.sgml.rej
=== using 'git apply' to apply patch ./v13-0001-Add-hash_make-macros.patch ===
Applied patch to 'doc/src/sgml/system-views.sgml' with conflicts.
Applied patch to 'src/backend/utils/hash/dynahash.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/include/storage/shmem.h' cleanly.
Applied patch to 'src/include/utils/hsearch.h' cleanly.
Applied patch to 'src/test/modules/test_cplusplusext/test_cplusplusext.cpp' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U doc/src/sgml/system-views.sgml
diff --cc doc/src/sgml/system-views.sgml
index 2ebec6928d5,c7c05956820..00000000000
--- a/doc/src/sgml/system-views.sgml
+++ b/doc/src/sgml/system-views.sgml
@@@ -4254,8 -4254,11 +4254,16 @@@ SELECT * FROM pg_locks pl LEFT JOIN pg_
    <para>
     Anonymous allocations are allocations that have been made
     with <literal>ShmemAlloc()</literal> directly, rather than via
++<<<<<<< ours
 +   <literal>ShmemRequestStruct()</literal> or
 +   <literal>ShmemRequestHash()</literal>.
++=======
+    <literal>ShmemInitStruct()</literal>,
+    <literal>shmem_hash_make()</literal>,
+    <literal>shmem_hash_make_ext()</literal>,
+    or
+    <literal>ShmemInitHash()</literal>.
++>>>>>>> theirs
    </para>
  
    <para>