Towards easier AMs: Cleaning up inappropriate use of name "relkind"

Applying: Refactoring relkind handling
Using index info to reconstruct a base tree...
M	contrib/oid2name/oid2name.c
M	contrib/pageinspect/rawpage.c
M	contrib/pg_visibility/pg_visibility.c
M	contrib/pgrowlocks/pgrowlocks.c
M	contrib/pgstattuple/pgstatapprox.c
M	contrib/pgstattuple/pgstatindex.c
M	contrib/pgstattuple/pgstattuple.c
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/sepgsql/dml.c
M	contrib/sepgsql/label.c
M	contrib/sepgsql/relation.c
M	contrib/vacuumlo/vacuumlo.c
M	src/backend/access/common/reloptions.c
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/backend/access/heap/heaptoast.c
M	src/backend/access/index/indexam.c
M	src/backend/access/table/table.c
M	src/backend/access/table/tableam.c
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/index.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/partition.c
M	src/backend/catalog/pg_depend.c
M	src/backend/catalog/pg_publication.c
M	src/backend/catalog/pg_type.c
M	src/backend/catalog/toasting.c
M	src/backend/commands/analyze.c
A	src/backend/commands/cluster.c
M	src/backend/commands/comment.c
M	src/backend/commands/copy.c
M	src/backend/commands/extension.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/lockcmds.c
M	src/backend/commands/policy.c
M	src/backend/commands/publicationcmds.c
M	src/backend/commands/seclabel.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/typecmds.c
M	src/backend/commands/vacuum.c
M	src/backend/executor/execMain.c
M	src/backend/executor/execReplication.c
M	src/backend/executor/nodeModifyTable.c
M	src/backend/optimizer/path/allpaths.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/util/inherit.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/parser/parse_utilcmd.c
M	src/backend/partitioning/partbounds.c
M	src/backend/postmaster/autovacuum.c
A	src/backend/replication/basebackup.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/logical/worker.c
M	src/backend/replication/slot.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/rewrite/rewriteHandler.c
M	src/backend/rewrite/rowsecurity.c
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/lmgr/proc.c
A	src/backend/storage/lmgr/spin.c
M	src/backend/tcop/utility.c
M	src/backend/utils/adt/amutils.c
M	src/backend/utils/adt/dbsize.c
M	src/backend/utils/adt/partitionfuncs.c
M	src/backend/utils/adt/tid.c
M	src/backend/utils/adt/xml.c
M	src/backend/utils/cache/partcache.c
M	src/backend/utils/cache/relcache.c
M	src/bin/initdb/initdb.c
M	src/bin/pg_dump/common.c
M	src/bin/pg_dump/pg_backup_tar.c
M	src/bin/pg_dump/pg_dump.c
M	src/bin/pg_dump/pg_dump_sort.c
M	src/bin/pg_upgrade/info.c
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/version.c
M	src/bin/psql/command.c
M	src/bin/psql/describe.c
A	src/bin/psql/tab-complete.c
M	src/bin/scripts/reindexdb.c
M	src/bin/scripts/vacuumdb.c
M	src/include/catalog/pg_class.h
M	src/include/nodes/execnodes.h
M	src/include/storage/proc.h
M	src/include/utils/builtins.h
M	src/pl/plpgsql/src/pl_comp.c
M	src/test/regress/regress.c
A	src/tools/findoidjoins/findoidjoins.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/tools/findoidjoins/findoidjoins.c deleted in HEAD and modified in Refactoring relkind handling. Version Refactoring relkind handling of src/tools/findoidjoins/findoidjoins.c left in tree.
Auto-merging src/test/regress/regress.c
CONFLICT (content): Merge conflict in src/test/regress/regress.c
Auto-merging src/pl/plpgsql/src/pl_comp.c
CONFLICT (content): Merge conflict in src/pl/plpgsql/src/pl_comp.c
Auto-merging src/include/utils/builtins.h
CONFLICT (content): Merge conflict in src/include/utils/builtins.h
Auto-merging src/include/storage/proc.h
Auto-merging src/include/nodes/execnodes.h
CONFLICT (content): Merge conflict in src/include/nodes/execnodes.h
Auto-merging src/include/catalog/pg_class.h
CONFLICT (content): Merge conflict in src/include/catalog/pg_class.h
Auto-merging src/bin/scripts/vacuumdb.c
CONFLICT (content): Merge conflict in src/bin/scripts/vacuumdb.c
Auto-merging src/bin/scripts/reindexdb.c
CONFLICT (content): Merge conflict in src/bin/scripts/reindexdb.c
CONFLICT (modify/delete): src/bin/psql/tab-complete.c deleted in HEAD and modified in Refactoring relkind handling. Version Refactoring relkind handling of src/bin/psql/tab-complete.c left in tree.
Auto-merging src/bin/psql/describe.c
CONFLICT (content): Merge conflict in src/bin/psql/describe.c
Auto-merging src/bin/psql/command.c
Auto-merging src/bin/pg_upgrade/version.c
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/version.c
Auto-merging src/bin/pg_upgrade/pg_upgrade.c
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/pg_upgrade.c
Auto-merging src/bin/pg_upgrade/info.c
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/info.c
Auto-merging src/bin/pg_dump/pg_dump_sort.c
Auto-merging src/bin/pg_dump/pg_dump.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.c
Auto-merging src/bin/pg_dump/pg_backup_tar.c
Auto-merging src/bin/pg_dump/common.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/common.c
Auto-merging src/bin/initdb/initdb.c
CONFLICT (content): Merge conflict in src/bin/initdb/initdb.c
Auto-merging src/backend/utils/cache/relcache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/relcache.c
Auto-merging src/backend/utils/cache/partcache.c
Auto-merging src/backend/utils/adt/xml.c
Auto-merging src/backend/utils/adt/tid.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/tid.c
Auto-merging src/backend/utils/adt/partitionfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/partitionfuncs.c
Auto-merging src/backend/utils/adt/dbsize.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/dbsize.c
Auto-merging src/backend/utils/adt/amutils.c
Auto-merging src/backend/tcop/utility.c
CONFLICT (content): Merge conflict in src/backend/tcop/utility.c
CONFLICT (modify/delete): src/backend/storage/lmgr/spin.c deleted in HEAD and modified in Refactoring relkind handling. Version Refactoring relkind handling of src/backend/storage/lmgr/spin.c left in tree.
Auto-merging src/backend/storage/lmgr/proc.c
CONFLICT (content): Merge conflict in src/backend/storage/lmgr/proc.c
Auto-merging src/backend/storage/buffer/bufmgr.c
CONFLICT (content): Merge conflict in src/backend/storage/buffer/bufmgr.c
Auto-merging src/backend/rewrite/rowsecurity.c
Auto-merging src/backend/rewrite/rewriteHandler.c
CONFLICT (content): Merge conflict in src/backend/rewrite/rewriteHandler.c
Auto-merging src/backend/rewrite/rewriteDefine.c
CONFLICT (content): Merge conflict in src/backend/rewrite/rewriteDefine.c
Auto-merging src/backend/replication/slot.c
CONFLICT (content): Merge conflict in src/backend/replication/slot.c
Auto-merging src/backend/replication/logical/worker.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/worker.c
Auto-merging src/backend/replication/logical/tablesync.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/tablesync.c
Auto-merging src/backend/replication/logical/reorderbuffer.c
CONFLICT (modify/delete): src/backend/replication/basebackup.c deleted in HEAD and modified in Refactoring relkind handling. Version Refactoring relkind handling of src/backend/replication/basebackup.c left in tree.
Auto-merging src/backend/postmaster/autovacuum.c
CONFLICT (content): Merge conflict in src/backend/postmaster/autovacuum.c
Auto-merging src/backend/partitioning/partbounds.c
Auto-merging src/backend/parser/parse_utilcmd.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_utilcmd.c
Auto-merging src/backend/optimizer/util/plancat.c
CONFLICT (content): Merge conflict in src/backend/optimizer/util/plancat.c
Auto-merging src/backend/optimizer/util/inherit.c
CONFLICT (content): Merge conflict in src/backend/optimizer/util/inherit.c
Auto-merging src/backend/optimizer/plan/planner.c
CONFLICT (content): Merge conflict in src/backend/optimizer/plan/planner.c
Auto-merging src/backend/optimizer/path/allpaths.c
CONFLICT (content): Merge conflict in src/backend/optimizer/path/allpaths.c
Auto-merging src/backend/executor/nodeModifyTable.c
CONFLICT (content): Merge conflict in src/backend/executor/nodeModifyTable.c
Auto-merging src/backend/executor/execReplication.c
CONFLICT (content): Merge conflict in src/backend/executor/execReplication.c
Auto-merging src/backend/executor/execMain.c
CONFLICT (content): Merge conflict in src/backend/executor/execMain.c
Auto-merging src/backend/commands/vacuum.c
CONFLICT (content): Merge conflict in src/backend/commands/vacuum.c
Auto-merging src/backend/commands/typecmds.c
Auto-merging src/backend/commands/trigger.c
CONFLICT (content): Merge conflict in src/backend/commands/trigger.c
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/statscmds.c
CONFLICT (content): Merge conflict in src/backend/commands/statscmds.c
Auto-merging src/backend/commands/sequence.c
CONFLICT (content): Merge conflict in src/backend/commands/sequence.c
Auto-merging src/backend/commands/seclabel.c
CONFLICT (content): Merge conflict in src/backend/commands/seclabel.c
Auto-merging src/backend/commands/publicationcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/publicationcmds.c
Auto-merging src/backend/commands/policy.c
CONFLICT (content): Merge conflict in src/backend/commands/policy.c
Auto-merging src/backend/commands/lockcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/lockcmds.c
Auto-merging src/backend/commands/indexcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/indexcmds.c
Auto-merging src/backend/commands/extension.c
Auto-merging src/backend/commands/copy.c
CONFLICT (content): Merge conflict in src/backend/commands/copy.c
Auto-merging src/backend/commands/comment.c
CONFLICT (content): Merge conflict in src/backend/commands/comment.c
CONFLICT (modify/delete): src/backend/commands/cluster.c deleted in HEAD and modified in Refactoring relkind handling. Version Refactoring relkind handling of src/backend/commands/cluster.c left in tree.
Auto-merging src/backend/commands/analyze.c
CONFLICT (content): Merge conflict in src/backend/commands/analyze.c
Auto-merging src/backend/catalog/toasting.c
CONFLICT (content): Merge conflict in src/backend/catalog/toasting.c
Auto-merging src/backend/catalog/pg_type.c
Auto-merging src/backend/catalog/pg_publication.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_publication.c
Auto-merging src/backend/catalog/pg_depend.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_depend.c
Auto-merging src/backend/catalog/partition.c
Auto-merging src/backend/catalog/objectaddress.c
CONFLICT (content): Merge conflict in src/backend/catalog/objectaddress.c
Auto-merging src/backend/catalog/index.c
CONFLICT (content): Merge conflict in src/backend/catalog/index.c
Auto-merging src/backend/catalog/heap.c
CONFLICT (content): Merge conflict in src/backend/catalog/heap.c
Auto-merging src/backend/catalog/dependency.c
Auto-merging src/backend/catalog/aclchk.c
CONFLICT (content): Merge conflict in src/backend/catalog/aclchk.c
Auto-merging src/backend/access/table/tableam.c
Auto-merging src/backend/access/table/table.c
CONFLICT (content): Merge conflict in src/backend/access/table/table.c
Auto-merging src/backend/access/index/indexam.c
CONFLICT (content): Merge conflict in src/backend/access/index/indexam.c
Auto-merging src/backend/access/heap/heaptoast.c
Auto-merging src/backend/access/heap/heapam_handler.c
CONFLICT (content): Merge conflict in src/backend/access/heap/heapam_handler.c
Auto-merging src/backend/access/heap/heapam.c
Auto-merging src/backend/access/common/reloptions.c
Auto-merging contrib/vacuumlo/vacuumlo.c
Auto-merging contrib/sepgsql/relation.c
CONFLICT (content): Merge conflict in contrib/sepgsql/relation.c
Auto-merging contrib/sepgsql/label.c
Auto-merging contrib/sepgsql/dml.c
CONFLICT (content): Merge conflict in contrib/sepgsql/dml.c
Auto-merging contrib/postgres_fdw/postgres_fdw.c
CONFLICT (content): Merge conflict in contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/pgstattuple/pgstattuple.c
CONFLICT (content): Merge conflict in contrib/pgstattuple/pgstattuple.c
Auto-merging contrib/pgstattuple/pgstatindex.c
CONFLICT (content): Merge conflict in contrib/pgstattuple/pgstatindex.c
Auto-merging contrib/pgstattuple/pgstatapprox.c
CONFLICT (content): Merge conflict in contrib/pgstattuple/pgstatapprox.c
Auto-merging contrib/pgrowlocks/pgrowlocks.c
CONFLICT (content): Merge conflict in contrib/pgrowlocks/pgrowlocks.c
Auto-merging contrib/pg_visibility/pg_visibility.c
CONFLICT (content): Merge conflict in contrib/pg_visibility/pg_visibility.c
Auto-merging contrib/pageinspect/rawpage.c
CONFLICT (content): Merge conflict in contrib/pageinspect/rawpage.c
Auto-merging contrib/oid2name/oid2name.c
Patch failed at 0001 Refactoring relkind handling

/ci/repo/worktrees/worktree/rebase-apply/patch:2391: trailing whitespace.
		
/ci/repo/worktrees/worktree/rebase-apply/patch:6902: trailing whitespace.
	
/ci/repo/worktrees/worktree/rebase-apply/patch:6930: trailing whitespace.
	
/ci/repo/worktrees/worktree/rebase-apply/patch:6933: trailing whitespace.
	
/ci/repo/worktrees/worktree/rebase-apply/patch:6936: trailing whitespace.
	
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
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"