=== Applying patches on top of PostgreSQL commit ID a9afa021e95f2b0ffaaf26f3a27e685f634f4ac9 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Feb 2 13:35:28 UTC 2026 On branch cf/5318 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Add-infrastructure-for-pg_system_versions-view.patch === Applying: Add infrastructure for pg_system_versions view Using index info to reconstruct a base tree... M doc/src/sgml/system-views.sgml M src/backend/catalog/system_views.sql M src/backend/utils/misc/meson.build M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/expected/rules.out Auto-merging src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/misc/meson.build Auto-merging src/backend/catalog/system_views.sql Auto-merging doc/src/sgml/system-views.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add infrastructure for pg_system_versions view 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 doc/src/sgml/system-views.sgml M src/backend/catalog/system_views.sql M src/backend/utils/misc/Makefile M src/backend/utils/misc/meson.build M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Removing src/backend/utils/misc/system_version.c Removing src/include/utils/system_version.h === using patch(1) to apply patch ./v6-0001-Add-infrastructure-for-pg_system_versions-view.patch === patching file doc/src/sgml/system-views.sgml Hunk #2 succeeded at 5063 (offset 72 lines). patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 1452 (offset 14 lines). patching file src/backend/utils/misc/Makefile patching file src/backend/utils/misc/meson.build patching file src/backend/utils/misc/system_version.c patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12695 with fuzz 2 (offset 91 lines). patching file src/include/utils/system_version.h patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 2705 (offset 22 lines). patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2977 (offset 43 lines). Hunk #2 succeeded at 4272 with fuzz 1 (offset 56 lines). [cf/5318 81de7331dba] Add infrastructure for pg_system_versions view Author: Dmitrii Dolgov <9erthalion6@gmail.com> Date: Sun Nov 16 16:01:21 2025 +0100 9 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 src/backend/utils/misc/system_version.c create mode 100644 src/include/utils/system_version.h === using 'git am' to apply patch ./v6-0002-Add-core-versions-to-pg_system_versions.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v6-0002-Add-core-versions-to-pg_system_versions.patch === patching file configure Hunk #1 succeeded at 19504 (offset 211 lines). patching file configure.ac Hunk #1 succeeded at 2493 (offset 45 lines). patching file meson.build Hunk #1 succeeded at 3034 (offset 62 lines). patching file src/backend/tcop/postgres.c patching file src/backend/utils/misc/system_version.c patching file src/include/pg_config.h.in Hunk #1 succeeded at 605 (offset -16 lines). patching file src/include/utils/system_version.h patching file src/test/regress/expected/sysviews.out patching file src/test/regress/sql/sysviews.sql [cf/5318 30d2f21c921] Add core versions to pg_system_versions Author: Dmitrii Dolgov <9erthalion6@gmail.com> Date: Wed Nov 26 20:05:20 2025 +0100 9 files changed, 125 insertions(+) === using 'git am' to apply patch ./v6-0003-Add-JIT-provider-version-to-pg_system_versions.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v6-0003-Add-JIT-provider-version-to-pg_system_versions.patch === patching file src/backend/jit/jit.c patching file src/backend/jit/llvm/llvmjit.c patching file src/backend/tcop/postgres.c patching file src/backend/utils/misc/system_version.c patching file src/include/jit/jit.h patching file src/include/jit/llvmjit.h [cf/5318 f6c60daaead] Add JIT provider version to pg_system_versions Author: Dmitrii Dolgov <9erthalion6@gmail.com> Date: Sat Oct 5 18:31:36 2024 +0200 6 files changed, 66 insertions(+)