WAL-logging facility for pgstats kinds

Applying: Add RMGR and WAL-logging API for pgstats
Using index info to reconstruct a base tree...
M	src/backend/access/rmgrdesc/meson.build
M	src/backend/access/transam/rmgr.c
M	src/backend/utils/activity/Makefile
M	src/backend/utils/activity/meson.build
M	src/bin/pg_waldump/rmgrdesc.c
M	src/bin/pg_waldump/t/001_basic.pl
M	src/include/access/rmgrlist.h
M	src/include/utils/pgstat_internal.h
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/include/utils/pgstat_internal.h
Auto-merging src/include/access/rmgrlist.h
CONFLICT (content): Merge conflict in src/include/access/rmgrlist.h
Auto-merging src/bin/pg_waldump/t/001_basic.pl
CONFLICT (content): Merge conflict in src/bin/pg_waldump/t/001_basic.pl
Auto-merging src/bin/pg_waldump/rmgrdesc.c
Auto-merging src/backend/utils/activity/meson.build
Auto-merging src/backend/utils/activity/Makefile
Auto-merging src/backend/access/transam/rmgr.c
Auto-merging src/backend/access/rmgrdesc/meson.build
Patch failed at 0001 Add RMGR and WAL-logging API for pgstats

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"