Array initialisation notation in syscache.c

Applying: Use variadic macros for syscache lookup functions.
Using index info to reconstruct a base tree...
M	contrib/bloom/blvalidate.c
M	contrib/postgres_fdw/connection.c
M	contrib/postgres_fdw/deparse.c
M	contrib/sepgsql/dml.c
M	contrib/sepgsql/proc.c
M	contrib/sepgsql/relation.c
M	contrib/tcn/tcn.c
M	contrib/unaccent/unaccent.c
M	src/backend/access/brin/brin_inclusion.c
M	src/backend/access/brin/brin_minmax.c
M	src/backend/access/brin/brin_minmax_multi.c
M	src/backend/access/brin/brin_validate.c
M	src/backend/access/common/relation.c
M	src/backend/access/common/tupdesc.c
M	src/backend/access/gin/ginvalidate.c
M	src/backend/access/gist/gistutil.c
M	src/backend/access/gist/gistvalidate.c
M	src/backend/access/hash/hashvalidate.c
M	src/backend/access/index/amapi.c
M	src/backend/access/index/amvalidate.c
M	src/backend/access/nbtree/nbtvalidate.c
M	src/backend/access/spgist/spgutils.c
M	src/backend/access/spgist/spgvalidate.c
M	src/backend/access/transam/varsup.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/namespace.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/partition.c
M	src/backend/catalog/pg_aggregate.c
M	src/backend/catalog/pg_attrdef.c
M	src/backend/catalog/pg_cast.c
M	src/backend/catalog/pg_collation.c
M	src/backend/catalog/pg_constraint.c
M	src/backend/catalog/pg_conversion.c
M	src/backend/catalog/pg_enum.c
M	src/backend/catalog/pg_inherits.c
M	src/backend/catalog/pg_namespace.c
M	src/backend/catalog/pg_operator.c
M	src/backend/catalog/pg_parameter_acl.c
M	src/backend/catalog/pg_proc.c
M	src/backend/catalog/pg_publication.c
M	src/backend/catalog/pg_shdepend.c
M	src/backend/catalog/pg_subscription.c
M	src/backend/catalog/pg_type.c
M	src/backend/catalog/toasting.c
M	src/backend/commands/alter.c
M	src/backend/commands/amcmds.c
M	src/backend/commands/analyze.c
A	src/backend/commands/cluster.c
M	src/backend/commands/collationcmds.c
M	src/backend/commands/dbcommands.c
M	src/backend/commands/event_trigger.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/lockcmds.c
M	src/backend/commands/matview.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/operatorcmds.c
M	src/backend/commands/policy.c
M	src/backend/commands/proclang.c
M	src/backend/commands/publicationcmds.c
M	src/backend/commands/schemacmds.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/subscriptioncmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/typecmds.c
M	src/backend/commands/user.c
M	src/backend/commands/vacuum.c
M	src/backend/commands/variable.c
M	src/backend/executor/execAmi.c
M	src/backend/executor/functions.c
M	src/backend/executor/nodeAgg.c
M	src/backend/executor/nodeHash.c
M	src/backend/executor/nodeWindowAgg.c
M	src/backend/executor/spi.c
M	src/backend/foreign/foreign.c
M	src/backend/libpq/crypt.c
M	src/backend/optimizer/plan/planagg.c
M	src/backend/optimizer/plan/setrefs.c
M	src/backend/optimizer/plan/subselect.c
M	src/backend/optimizer/prep/prepagg.c
M	src/backend/optimizer/util/clauses.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/parser/analyze.c
M	src/backend/parser/parse_agg.c
M	src/backend/parser/parse_clause.c
M	src/backend/parser/parse_coerce.c
M	src/backend/parser/parse_func.c
M	src/backend/parser/parse_oper.c
M	src/backend/parser/parse_relation.c
M	src/backend/parser/parse_type.c
M	src/backend/parser/parse_utilcmd.c
M	src/backend/partitioning/partbounds.c
M	src/backend/partitioning/partdesc.c
M	src/backend/postmaster/autovacuum.c
M	src/backend/replication/logical/origin.c
M	src/backend/replication/logical/proto.c
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/logical/worker.c
M	src/backend/replication/pgoutput/pgoutput.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/rewrite/rewriteSupport.c
M	src/backend/statistics/dependencies.c
M	src/backend/statistics/extended_stats.c
M	src/backend/statistics/mcv.c
M	src/backend/statistics/mvdistinct.c
M	src/backend/tcop/fastpath.c
M	src/backend/utils/activity/pgstat_function.c
M	src/backend/utils/adt/acl.c
M	src/backend/utils/adt/amutils.c
M	src/backend/utils/adt/dbsize.c
M	src/backend/utils/adt/domains.c
M	src/backend/utils/adt/enum.c
M	src/backend/utils/adt/format_type.c
M	src/backend/utils/adt/genfile.c
M	src/backend/utils/adt/jsonfuncs.c
M	src/backend/utils/adt/partitionfuncs.c
M	src/backend/utils/adt/pg_locale.c
M	src/backend/utils/adt/regproc.c
M	src/backend/utils/adt/ri_triggers.c
M	src/backend/utils/adt/ruleutils.c
M	src/backend/utils/adt/selfuncs.c
M	src/backend/utils/adt/xml.c
M	src/backend/utils/cache/attoptcache.c
M	src/backend/utils/cache/inval.c
M	src/backend/utils/cache/lsyscache.c
M	src/backend/utils/cache/partcache.c
M	src/backend/utils/cache/relcache.c
M	src/backend/utils/cache/spccache.c
M	src/backend/utils/cache/syscache.c
M	src/backend/utils/cache/ts_cache.c
M	src/backend/utils/cache/typcache.c
M	src/backend/utils/fmgr/fmgr.c
M	src/backend/utils/fmgr/funcapi.c
M	src/backend/utils/init/miscinit.c
M	src/backend/utils/init/postinit.c
M	src/backend/utils/misc/rls.c
M	src/backend/utils/misc/superuser.c
M	src/include/utils/syscache.h
M	src/pl/plperl/plperl.c
M	src/pl/plpgsql/src/pl_comp.c
M	src/pl/plpgsql/src/pl_exec.c
M	src/pl/plpgsql/src/pl_handler.c
M	src/pl/plpython/plpy_main.c
M	src/pl/plpython/plpy_procedure.c
M	src/pl/tcl/pltcl.c
M	src/test/modules/plsample/plsample.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/plsample/plsample.c
Auto-merging src/pl/tcl/pltcl.c
Auto-merging src/pl/plpython/plpy_procedure.c
CONFLICT (content): Merge conflict in src/pl/plpython/plpy_procedure.c
Auto-merging src/pl/plpython/plpy_main.c
Auto-merging src/pl/plpgsql/src/pl_handler.c
Auto-merging src/pl/plpgsql/src/pl_exec.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/pl/plperl/plperl.c
Auto-merging src/include/utils/syscache.h
CONFLICT (content): Merge conflict in src/include/utils/syscache.h
Auto-merging src/backend/utils/misc/superuser.c
Auto-merging src/backend/utils/misc/rls.c
Auto-merging src/backend/utils/init/postinit.c
Auto-merging src/backend/utils/init/miscinit.c
Auto-merging src/backend/utils/fmgr/funcapi.c
Auto-merging src/backend/utils/fmgr/fmgr.c
Auto-merging src/backend/utils/cache/typcache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/typcache.c
Auto-merging src/backend/utils/cache/ts_cache.c
Auto-merging src/backend/utils/cache/syscache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/syscache.c
Auto-merging src/backend/utils/cache/spccache.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
CONFLICT (content): Merge conflict in src/backend/utils/cache/partcache.c
Auto-merging src/backend/utils/cache/lsyscache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/lsyscache.c
Auto-merging src/backend/utils/cache/inval.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/inval.c
Auto-merging src/backend/utils/cache/attoptcache.c
Auto-merging src/backend/utils/adt/xml.c
Auto-merging src/backend/utils/adt/selfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/selfuncs.c
Auto-merging src/backend/utils/adt/ruleutils.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/ruleutils.c
Auto-merging src/backend/utils/adt/ri_triggers.c
Auto-merging src/backend/utils/adt/regproc.c
Auto-merging src/backend/utils/adt/pg_locale.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/pg_locale.c
Auto-merging src/backend/utils/adt/partitionfuncs.c
Auto-merging src/backend/utils/adt/jsonfuncs.c
Auto-merging src/backend/utils/adt/genfile.c
Auto-merging src/backend/utils/adt/format_type.c
Auto-merging src/backend/utils/adt/enum.c
Auto-merging src/backend/utils/adt/domains.c
Auto-merging src/backend/utils/adt/dbsize.c
Auto-merging src/backend/utils/adt/amutils.c
Auto-merging src/backend/utils/adt/acl.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/acl.c
Auto-merging src/backend/utils/activity/pgstat_function.c
Auto-merging src/backend/tcop/fastpath.c
Auto-merging src/backend/statistics/mvdistinct.c
Auto-merging src/backend/statistics/mcv.c
Auto-merging src/backend/statistics/extended_stats.c
CONFLICT (content): Merge conflict in src/backend/statistics/extended_stats.c
Auto-merging src/backend/statistics/dependencies.c
Auto-merging src/backend/rewrite/rewriteSupport.c
Auto-merging src/backend/rewrite/rewriteDefine.c
Auto-merging src/backend/replication/pgoutput/pgoutput.c
CONFLICT (content): Merge conflict in src/backend/replication/pgoutput/pgoutput.c
Auto-merging src/backend/replication/logical/worker.c
Auto-merging src/backend/replication/logical/tablesync.c
Auto-merging src/backend/replication/logical/proto.c
Auto-merging src/backend/replication/logical/origin.c
Auto-merging src/backend/postmaster/autovacuum.c
Auto-merging src/backend/partitioning/partdesc.c
CONFLICT (content): Merge conflict in src/backend/partitioning/partdesc.c
Auto-merging src/backend/partitioning/partbounds.c
CONFLICT (content): Merge conflict in src/backend/partitioning/partbounds.c
Auto-merging src/backend/parser/parse_utilcmd.c
Auto-merging src/backend/parser/parse_type.c
Auto-merging src/backend/parser/parse_relation.c
Auto-merging src/backend/parser/parse_oper.c
Auto-merging src/backend/parser/parse_func.c
Auto-merging src/backend/parser/parse_coerce.c
Auto-merging src/backend/parser/parse_clause.c
Auto-merging src/backend/parser/parse_agg.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_agg.c
Auto-merging src/backend/parser/analyze.c
Auto-merging src/backend/optimizer/util/plancat.c
Auto-merging src/backend/optimizer/util/clauses.c
Auto-merging src/backend/optimizer/prep/prepagg.c
Auto-merging src/backend/optimizer/plan/subselect.c
Auto-merging src/backend/optimizer/plan/setrefs.c
Auto-merging src/backend/optimizer/plan/planagg.c
Auto-merging src/backend/libpq/crypt.c
Auto-merging src/backend/foreign/foreign.c
Auto-merging src/backend/executor/spi.c
Auto-merging src/backend/executor/nodeWindowAgg.c
Auto-merging src/backend/executor/nodeHash.c
Auto-merging src/backend/executor/nodeAgg.c
Auto-merging src/backend/executor/functions.c
CONFLICT (content): Merge conflict in src/backend/executor/functions.c
Auto-merging src/backend/executor/execAmi.c
Auto-merging src/backend/commands/variable.c
CONFLICT (content): Merge conflict in src/backend/commands/variable.c
Auto-merging src/backend/commands/vacuum.c
CONFLICT (content): Merge conflict in src/backend/commands/vacuum.c
Auto-merging src/backend/commands/user.c
CONFLICT (content): Merge conflict in src/backend/commands/user.c
Auto-merging src/backend/commands/typecmds.c
Auto-merging src/backend/commands/tsearchcmds.c
Auto-merging 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/subscriptioncmds.c
CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c
Auto-merging 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/schemacmds.c
Auto-merging src/backend/commands/publicationcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/publicationcmds.c
Auto-merging src/backend/commands/proclang.c
Auto-merging src/backend/commands/policy.c
Auto-merging src/backend/commands/operatorcmds.c
Auto-merging src/backend/commands/opclasscmds.c
Auto-merging src/backend/commands/matview.c
Auto-merging 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/functioncmds.c
Auto-merging src/backend/commands/foreigncmds.c
Auto-merging src/backend/commands/event_trigger.c
Auto-merging src/backend/commands/dbcommands.c
CONFLICT (content): Merge conflict in src/backend/commands/dbcommands.c
Auto-merging src/backend/commands/collationcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/collationcmds.c
CONFLICT (modify/delete): src/backend/commands/cluster.c deleted in HEAD and modified in Use variadic macros for syscache lookup functions.. Version Use variadic macros for syscache lookup functions. 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/commands/amcmds.c
Auto-merging src/backend/commands/alter.c
CONFLICT (content): Merge conflict in src/backend/commands/alter.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_subscription.c
Auto-merging src/backend/catalog/pg_shdepend.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_proc.c
Auto-merging src/backend/catalog/pg_parameter_acl.c
Auto-merging src/backend/catalog/pg_operator.c
Auto-merging src/backend/catalog/pg_namespace.c
Auto-merging src/backend/catalog/pg_inherits.c
Auto-merging src/backend/catalog/pg_enum.c
Auto-merging src/backend/catalog/pg_conversion.c
Auto-merging src/backend/catalog/pg_constraint.c
Auto-merging src/backend/catalog/pg_collation.c
Auto-merging src/backend/catalog/pg_cast.c
Auto-merging src/backend/catalog/pg_attrdef.c
Auto-merging src/backend/catalog/pg_aggregate.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/namespace.c
CONFLICT (content): Merge conflict in src/backend/catalog/namespace.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
Auto-merging src/backend/catalog/dependency.c
CONFLICT (content): Merge conflict in 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/transam/varsup.c
Auto-merging src/backend/access/spgist/spgvalidate.c
CONFLICT (content): Merge conflict in src/backend/access/spgist/spgvalidate.c
Auto-merging src/backend/access/spgist/spgutils.c
Auto-merging src/backend/access/nbtree/nbtvalidate.c
CONFLICT (content): Merge conflict in src/backend/access/nbtree/nbtvalidate.c
Auto-merging src/backend/access/index/amvalidate.c
Auto-merging src/backend/access/index/amapi.c
Auto-merging src/backend/access/hash/hashvalidate.c
CONFLICT (content): Merge conflict in src/backend/access/hash/hashvalidate.c
Auto-merging src/backend/access/gist/gistvalidate.c
CONFLICT (content): Merge conflict in src/backend/access/gist/gistvalidate.c
Auto-merging src/backend/access/gist/gistutil.c
Auto-merging src/backend/access/gin/ginvalidate.c
CONFLICT (content): Merge conflict in src/backend/access/gin/ginvalidate.c
Auto-merging src/backend/access/common/tupdesc.c
Auto-merging src/backend/access/common/relation.c
Auto-merging src/backend/access/brin/brin_validate.c
CONFLICT (content): Merge conflict in src/backend/access/brin/brin_validate.c
Auto-merging src/backend/access/brin/brin_minmax_multi.c
CONFLICT (content): Merge conflict in src/backend/access/brin/brin_minmax_multi.c
Auto-merging src/backend/access/brin/brin_minmax.c
CONFLICT (content): Merge conflict in src/backend/access/brin/brin_minmax.c
Auto-merging src/backend/access/brin/brin_inclusion.c
CONFLICT (content): Merge conflict in src/backend/access/brin/brin_inclusion.c
Auto-merging contrib/unaccent/unaccent.c
Auto-merging contrib/tcn/tcn.c
Auto-merging contrib/sepgsql/relation.c
Auto-merging contrib/sepgsql/proc.c
Auto-merging contrib/sepgsql/dml.c
Auto-merging contrib/postgres_fdw/deparse.c
Auto-merging contrib/postgres_fdw/connection.c
Auto-merging contrib/bloom/blvalidate.c
CONFLICT (content): Merge conflict in contrib/bloom/blvalidate.c
Patch failed at 0001 Use variadic macros for syscache lookup functions.

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"