Enhancing Memory Context Statistics Reporting

Applying: Add function to get memory context stats for processes
Using index info to reconstruct a base tree...
M	doc/src/sgml/func/func-admin.sgml
M	src/backend/postmaster/autovacuum.c
M	src/backend/postmaster/checkpointer.c
M	src/backend/postmaster/pgarch.c
M	src/backend/postmaster/startup.c
M	src/backend/postmaster/walsummarizer.c
M	src/backend/storage/ipc/dsm_registry.c
M	src/backend/storage/ipc/ipci.c
M	src/backend/storage/ipc/procsignal.c
M	src/backend/tcop/postgres.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/backend/utils/adt/mcxtfuncs.c
M	src/backend/utils/init/globals.c
M	src/backend/utils/init/postinit.c
M	src/backend/utils/mmgr/mcxt.c
M	src/include/catalog/pg_proc.dat
M	src/include/miscadmin.h
M	src/include/storage/lwlocklist.h
M	src/include/storage/procsignal.h
M	src/include/utils/memutils.h
M	src/test/modules/Makefile
M	src/test/modules/meson.build
M	src/test/regress/expected/sysviews.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/sysviews.out
Auto-merging src/test/modules/meson.build
Auto-merging src/test/modules/Makefile
Auto-merging src/include/utils/memutils.h
Auto-merging src/include/storage/procsignal.h
Auto-merging src/include/storage/lwlocklist.h
CONFLICT (content): Merge conflict in src/include/storage/lwlocklist.h
Auto-merging src/include/miscadmin.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/mmgr/mcxt.c
Auto-merging src/backend/utils/init/postinit.c
Auto-merging src/backend/utils/init/globals.c
Auto-merging src/backend/utils/adt/mcxtfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/mcxtfuncs.c
Auto-merging src/backend/utils/activity/wait_event_names.txt
CONFLICT (content): Merge conflict in src/backend/utils/activity/wait_event_names.txt
Auto-merging src/backend/tcop/postgres.c
Auto-merging src/backend/storage/ipc/procsignal.c
Auto-merging src/backend/storage/ipc/ipci.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipci.c
Auto-merging src/backend/storage/ipc/dsm_registry.c
Auto-merging src/backend/postmaster/walsummarizer.c
Auto-merging src/backend/postmaster/startup.c
Auto-merging src/backend/postmaster/pgarch.c
Auto-merging src/backend/postmaster/checkpointer.c
Auto-merging src/backend/postmaster/autovacuum.c
Auto-merging doc/src/sgml/func/func-admin.sgml
Patch failed at 0001 Add function to get memory context stats for processes

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"