=== Applying patches on top of PostgreSQL commit ID 548de59d93d5593d5ef5354241510d57b68959db ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Dec 21 10:49:21 UTC 2025
On branch cf/6302
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Mark-function-arguments-of-type-T-as-const-T-wher.patch ===
Applying: Mark function arguments of type "T *" as "const T *" where possible
Using index info to reconstruct a base tree...
M	contrib/ltree/lquery_op.c
M	contrib/pg_trgm/trgm_op.c
M	src/backend/access/brin/brin.c
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/pruneheap.c
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/access/nbtree/nbtreadpage.c
M	src/backend/access/transam/multixact.c
M	src/backend/access/transam/xlog.c
M	src/backend/catalog/dependency.c
M	src/backend/executor/execPartition.c
M	src/backend/executor/nodeWindowAgg.c
M	src/backend/jit/llvm/llvmjit_expr.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/parser/parse_utilcmd.c
M	src/backend/partitioning/partbounds.c
M	src/backend/replication/logical/slotsync.c
M	src/backend/statistics/mvdistinct.c
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/ipc/waiteventset.c
M	src/backend/storage/lmgr/lwlock.c
M	src/backend/utils/adt/arrayfuncs.c
M	src/backend/utils/adt/jsonb.c
M	src/backend/utils/adt/jsonb_util.c
M	src/backend/utils/adt/pg_locale.c
M	src/backend/utils/adt/varlena.c
M	src/backend/utils/cache/relcache.c
M	src/backend/utils/misc/guc.c
M	src/test/modules/injection_points/injection_points.c
M	src/test/regress/regress.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/regress.c
Auto-merging src/test/modules/injection_points/injection_points.c
Auto-merging src/backend/utils/misc/guc.c
Auto-merging src/backend/utils/cache/relcache.c
Auto-merging src/backend/utils/adt/varlena.c
Auto-merging src/backend/utils/adt/pg_locale.c
Auto-merging src/backend/utils/adt/jsonb_util.c
Auto-merging src/backend/utils/adt/jsonb.c
Auto-merging src/backend/utils/adt/arrayfuncs.c
Auto-merging src/backend/storage/lmgr/lwlock.c
Auto-merging src/backend/storage/ipc/waiteventset.c
Auto-merging src/backend/storage/buffer/bufmgr.c
Auto-merging src/backend/statistics/mvdistinct.c
Auto-merging src/backend/replication/logical/slotsync.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
Auto-merging src/backend/jit/llvm/llvmjit_expr.c
Auto-merging src/backend/executor/nodeWindowAgg.c
Auto-merging src/backend/executor/execPartition.c
Auto-merging src/backend/catalog/dependency.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging src/backend/access/transam/multixact.c
Auto-merging src/backend/access/nbtree/nbtreadpage.c
Auto-merging src/backend/access/heap/vacuumlazy.c
Auto-merging src/backend/access/heap/pruneheap.c
CONFLICT (content): Merge conflict in src/backend/access/heap/pruneheap.c
Auto-merging src/backend/access/heap/heapam.c
Auto-merging src/backend/access/brin/brin.c
Auto-merging contrib/pg_trgm/trgm_op.c
Auto-merging contrib/ltree/lquery_op.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Mark function arguments of type "T *" as "const T *" where possible
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	contrib/bloom/blinsert.c
M	contrib/dblink/dblink.c
M	contrib/file_fdw/file_fdw.c
M	contrib/fuzzystrmatch/dmetaphone.c
M	contrib/fuzzystrmatch/fuzzystrmatch.c
M	contrib/intarray/_int_bool.c
M	contrib/isn/isn.c
M	contrib/jsonb_plpython/jsonb_plpython.c
M	contrib/ltree/lquery_op.c
M	contrib/pg_trgm/trgm_op.c
M	contrib/pg_trgm/trgm_regexp.c
M	contrib/pg_walinspect/pg_walinspect.c
M	contrib/pgcrypto/pgp-info.c
M	contrib/pgcrypto/pgp-pgsql.c
M	contrib/pgcrypto/pgp-pubdec.c
M	contrib/pgcrypto/pgp-pubkey.c
M	contrib/seg/seg.c
M	contrib/test_decoding/test_decoding.c
M	contrib/xml2/xpath.c
M	src/backend/access/brin/brin.c
M	src/backend/access/brin/brin_bloom.c
M	src/backend/access/brin/brin_tuple.c
M	src/backend/access/common/attmap.c
M	src/backend/access/common/printtup.c
M	src/backend/access/common/reloptions.c
M	src/backend/access/gin/ginentrypage.c
M	src/backend/access/gin/ginfast.c
M	src/backend/access/gin/ginscan.c
M	src/backend/access/gist/gistbuild.c
M	src/backend/access/gist/gistproc.c
M	src/backend/access/gist/gistsplit.c
M	src/backend/access/hash/hashsearch.c
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/pruneheap.c
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/access/nbtree/nbtinsert.c
M	src/backend/access/nbtree/nbtreadpage.c
M	src/backend/access/nbtree/nbtsort.c
M	src/backend/access/nbtree/nbtsplitloc.c
M	src/backend/access/rmgrdesc/xactdesc.c
M	src/backend/access/spgist/spgdoinsert.c
M	src/backend/access/spgist/spgkdtreeproc.c
M	src/backend/access/spgist/spgproc.c
M	src/backend/access/spgist/spgquadtreeproc.c
M	src/backend/access/spgist/spgscan.c
M	src/backend/access/spgist/spgutils.c
M	src/backend/access/transam/commit_ts.c
M	src/backend/access/transam/multixact.c
M	src/backend/access/transam/xlog.c
M	src/backend/access/transam/xlogprefetcher.c
M	src/backend/backup/backup_manifest.c
M	src/backend/backup/basebackup_copy.c
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/namespace.c
M	src/backend/catalog/pg_enum.c
M	src/backend/catalog/pg_publication.c
M	src/backend/commands/analyze.c
M	src/backend/commands/cluster.c
M	src/backend/commands/copyfrom.c
M	src/backend/commands/copyto.c
M	src/backend/commands/createas.c
M	src/backend/commands/dropcmds.c
M	src/backend/commands/extension.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/prepare.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/subscriptioncmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/user.c
M	src/backend/commands/vacuumparallel.c
M	src/backend/commands/view.c
M	src/backend/executor/execCurrent.c
M	src/backend/executor/execExprInterp.c
M	src/backend/executor/execGrouping.c
M	src/backend/executor/execParallel.c
M	src/backend/executor/execPartition.c
M	src/backend/executor/execReplication.c
M	src/backend/executor/execUtils.c
M	src/backend/executor/functions.c
M	src/backend/executor/instrument.c
M	src/backend/executor/nodeAgg.c
M	src/backend/executor/nodeGatherMerge.c
M	src/backend/executor/nodeIncrementalSort.c
M	src/backend/executor/nodeIndexonlyscan.c
M	src/backend/executor/nodeIndexscan.c
M	src/backend/executor/nodeLimit.c
M	src/backend/executor/nodeMemoize.c
M	src/backend/executor/nodeMergejoin.c
M	src/backend/executor/nodeModifyTable.c
M	src/backend/executor/nodeSetOp.c
M	src/backend/executor/nodeSubplan.c
M	src/backend/executor/nodeWindowAgg.c
M	src/backend/executor/nodeWorktablescan.c
M	src/backend/executor/spi.c
M	src/backend/jit/llvm/llvmjit_expr.c
M	src/backend/lib/dshash.c
M	src/backend/lib/integerset.c
M	src/backend/lib/pairingheap.c
M	src/backend/lib/rbtree.c
M	src/backend/libpq/auth-scram.c
M	src/backend/libpq/auth.c
M	src/backend/nodes/nodeFuncs.c
M	src/backend/nodes/tidbitmap.c
M	src/backend/optimizer/geqo/geqo_erx.c
M	src/backend/optimizer/geqo/geqo_misc.c
M	src/backend/optimizer/path/costsize.c
M	src/backend/optimizer/path/equivclass.c
M	src/backend/optimizer/path/indxpath.c
M	src/backend/optimizer/path/joinpath.c
M	src/backend/optimizer/path/pathkeys.c
M	src/backend/optimizer/path/tidpath.c
M	src/backend/optimizer/plan/analyzejoins.c
M	src/backend/optimizer/plan/createplan.c
M	src/backend/optimizer/plan/initsplan.c
M	src/backend/optimizer/plan/planagg.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/plan/subselect.c
M	src/backend/optimizer/prep/prepagg.c
M	src/backend/optimizer/prep/prepqual.c
M	src/backend/optimizer/prep/prepunion.c
M	src/backend/optimizer/util/clauses.c
M	src/backend/optimizer/util/inherit.c
M	src/backend/optimizer/util/pathnode.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/optimizer/util/relnode.c
M	src/backend/optimizer/util/tlist.c
M	src/backend/parser/analyze.c
M	src/backend/parser/parse_collate.c
M	src/backend/parser/parse_expr.c
M	src/backend/parser/parse_func.c
M	src/backend/parser/parse_merge.c
M	src/backend/parser/parse_relation.c
M	src/backend/parser/parse_utilcmd.c
M	src/backend/partitioning/partbounds.c
M	src/backend/postmaster/autovacuum.c
M	src/backend/postmaster/postmaster.c
M	src/backend/regex/regprefix.c
M	src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
M	src/backend/replication/logical/launcher.c
M	src/backend/replication/logical/relation.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/replication/logical/sequencesync.c
M	src/backend/replication/logical/slotsync.c
M	src/backend/replication/logical/snapbuild.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/replication/slot.c
M	src/backend/replication/syncrep.c
M	src/backend/replication/walsender.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/rewrite/rowsecurity.c
M	src/backend/statistics/dependencies.c
M	src/backend/statistics/mvdistinct.c
M	src/backend/storage/aio/aio.c
M	src/backend/storage/aio/read_stream.c
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/ipc/procarray.c
M	src/backend/storage/ipc/waiteventset.c
M	src/backend/storage/lmgr/lock.c
M	src/backend/storage/lmgr/lwlock.c
M	src/backend/tcop/fastpath.c
M	src/backend/tcop/postgres.c
M	src/backend/tsearch/dict_thesaurus.c
M	src/backend/tsearch/ts_parse.c
M	src/backend/tsearch/wparser_def.c
M	src/backend/utils/activity/pgstat_backend.c
M	src/backend/utils/adt/array_userfuncs.c
M	src/backend/utils/adt/arrayfuncs.c
M	src/backend/utils/adt/ascii.c
M	src/backend/utils/adt/date.c
M	src/backend/utils/adt/formatting.c
M	src/backend/utils/adt/geo_spgist.c
M	src/backend/utils/adt/jsonb.c
M	src/backend/utils/adt/jsonb_util.c
M	src/backend/utils/adt/jsonfuncs.c
M	src/backend/utils/adt/jsonpath_exec.c
M	src/backend/utils/adt/network_gist.c
M	src/backend/utils/adt/network_selfuncs.c
M	src/backend/utils/adt/numeric.c
M	src/backend/utils/adt/pg_locale.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/backend/utils/adt/rangetypes.c
M	src/backend/utils/adt/rangetypes_gist.c
M	src/backend/utils/adt/regexp.c
M	src/backend/utils/adt/selfuncs.c
M	src/backend/utils/adt/tsquery_util.c
M	src/backend/utils/adt/varlena.c
M	src/backend/utils/cache/catcache.c
M	src/backend/utils/cache/plancache.c
M	src/backend/utils/cache/relcache.c
M	src/backend/utils/fmgr/funcapi.c
M	src/backend/utils/hash/dynahash.c
M	src/backend/utils/misc/guc.c
M	src/backend/utils/mmgr/freepage.c
M	src/backend/utils/mmgr/generation.c
M	src/backend/utils/mmgr/slab.c
M	src/backend/utils/sort/sharedtuplestore.c
M	src/backend/utils/sort/tuplesort.c
M	src/bin/initdb/findtimezone.c
M	src/bin/pg_basebackup/pg_basebackup.c
M	src/bin/pg_basebackup/receivelog.c
M	src/bin/pg_combinebackup/backup_label.c
M	src/bin/pg_combinebackup/pg_combinebackup.c
M	src/bin/pg_combinebackup/reconstruct.c
M	src/bin/pg_dump/common.c
M	src/bin/pg_dump/compress_gzip.c
M	src/bin/pg_dump/compress_zstd.c
M	src/bin/pg_dump/parallel.c
M	src/bin/pg_dump/pg_backup_archiver.c
M	src/bin/pg_dump/pg_backup_custom.c
M	src/bin/pg_dump/pg_backup_directory.c
M	src/bin/pg_dump/pg_backup_tar.c
M	src/bin/pg_dump/pg_dumpall.c
M	src/bin/pg_rewind/pg_rewind.c
M	src/bin/pg_upgrade/info.c
M	src/bin/pg_waldump/pg_waldump.c
M	src/bin/pg_walsummary/pg_walsummary.c
M	src/bin/pgbench/pgbench.c
M	src/bin/psql/crosstabview.c
M	src/bin/scripts/clusterdb.c
M	src/bin/scripts/reindexdb.c
M	src/bin/scripts/vacuuming.c
M	src/common/parse_manifest.c
M	src/common/pg_lzcompress.c
M	src/interfaces/ecpg/ecpglib/execute.c
M	src/interfaces/ecpg/pgtypeslib/interval.c
M	src/interfaces/ecpg/pgtypeslib/numeric.c
M	src/interfaces/ecpg/preproc/type.c
M	src/interfaces/libpq/fe-print.c
M	src/pl/plperl/plperl.c
M	src/pl/plpgsql/src/pl_exec.c
M	src/pl/plpgsql/src/pl_funcs.c
M	src/pl/plpgsql/src/pl_scanner.c
M	src/pl/plpython/plpy_exec.c
M	src/pl/plpython/plpy_typeio.c
M	src/pl/tcl/pltcl.c
M	src/test/modules/injection_points/injection_points.c
M	src/test/modules/libpq_pipeline/libpq_pipeline.c
M	src/test/modules/test_radixtree/test_radixtree.c
M	src/test/modules/test_regex/test_regex.c
M	src/test/modules/test_resowner/test_resowner_many.c
M	src/test/modules/test_shm_mq/setup.c
M	src/test/modules/test_shm_mq/test.c
M	src/test/regress/regress.c
=== using patch(1) to apply patch ./v2-0001-Mark-function-arguments-of-type-T-as-const-T-wher.patch ===
patching file contrib/bloom/blinsert.c
patching file contrib/dblink/dblink.c
patching file contrib/file_fdw/file_fdw.c
patching file contrib/fuzzystrmatch/dmetaphone.c
patching file contrib/fuzzystrmatch/fuzzystrmatch.c
patching file contrib/intarray/_int_bool.c
patching file contrib/isn/isn.c
patching file contrib/jsonb_plpython/jsonb_plpython.c
patching file contrib/ltree/lquery_op.c
patching file contrib/pg_trgm/trgm_op.c
patching file contrib/pg_trgm/trgm_regexp.c
patching file contrib/pg_walinspect/pg_walinspect.c
patching file contrib/pgcrypto/pgp-info.c
patching file contrib/pgcrypto/pgp-pgsql.c
patching file contrib/pgcrypto/pgp-pubdec.c
patching file contrib/pgcrypto/pgp-pubkey.c
patching file contrib/seg/seg.c
patching file contrib/test_decoding/test_decoding.c
patching file contrib/xml2/xpath.c
patching file src/backend/access/brin/brin.c
patching file src/backend/access/brin/brin_bloom.c
patching file src/backend/access/brin/brin_tuple.c
patching file src/backend/access/common/attmap.c
patching file src/backend/access/common/printtup.c
patching file src/backend/access/common/reloptions.c
patching file src/backend/access/gin/ginentrypage.c
patching file src/backend/access/gin/ginfast.c
patching file src/backend/access/gin/ginscan.c
patching file src/backend/access/gist/gistbuild.c
patching file src/backend/access/gist/gistproc.c
patching file src/backend/access/gist/gistsplit.c
patching file src/backend/access/hash/hashsearch.c
patching file src/backend/access/heap/heapam.c
patching file src/backend/access/heap/pruneheap.c
Hunk #1 FAILED at 157.
Hunk #2 FAILED at 324.
Hunk #3 succeeded at 2003 (offset 10 lines).
Hunk #4 succeeded at 2065 (offset 10 lines).
2 out of 4 hunks FAILED -- saving rejects to file src/backend/access/heap/pruneheap.c.rej
patching file src/backend/access/heap/vacuumlazy.c
Hunk #3 succeeded at 3234 (offset -2 lines).
Hunk #4 succeeded at 3707 (offset -1 lines).
patching file src/backend/access/nbtree/nbtinsert.c
patching file src/backend/access/nbtree/nbtreadpage.c
Hunk #2 succeeded at 3308 (offset -9 lines).
Hunk #3 succeeded at 3572 (offset -9 lines).
patching file src/backend/access/nbtree/nbtsort.c
patching file src/backend/access/nbtree/nbtsplitloc.c
patching file src/backend/access/rmgrdesc/xactdesc.c
patching file src/backend/access/spgist/spgdoinsert.c
patching file src/backend/access/spgist/spgkdtreeproc.c
patching file src/backend/access/spgist/spgproc.c
patching file src/backend/access/spgist/spgquadtreeproc.c
patching file src/backend/access/spgist/spgscan.c
patching file src/backend/access/spgist/spgutils.c
patching file src/backend/access/transam/commit_ts.c
patching file src/backend/access/transam/multixact.c
Hunk #1 succeeded at 264 (offset 6 lines).
Hunk #2 succeeded at 758 (offset -17 lines).
patching file src/backend/access/transam/xlog.c
Hunk #3 succeeded at 7620 (offset 6 lines).
patching file src/backend/access/transam/xlogprefetcher.c
patching file src/backend/backup/backup_manifest.c
patching file src/backend/backup/basebackup_copy.c
patching file src/backend/catalog/aclchk.c
patching file src/backend/catalog/dependency.c
Hunk #4 succeeded at 2427 (offset 50 lines).
Hunk #5 succeeded at 2795 (offset 50 lines).
patching file src/backend/catalog/heap.c
patching file src/backend/catalog/namespace.c
patching file src/backend/catalog/pg_enum.c
patching file src/backend/catalog/pg_publication.c
patching file src/backend/commands/analyze.c
patching file src/backend/commands/cluster.c
patching file src/backend/commands/copyfrom.c
patching file src/backend/commands/copyto.c
patching file src/backend/commands/createas.c
patching file src/backend/commands/dropcmds.c
patching file src/backend/commands/extension.c
patching file src/backend/commands/foreigncmds.c
patching file src/backend/commands/functioncmds.c
patching file src/backend/commands/opclasscmds.c
patching file src/backend/commands/prepare.c
patching file src/backend/commands/sequence.c
patching file src/backend/commands/statscmds.c
patching file src/backend/commands/subscriptioncmds.c
patching file src/backend/commands/trigger.c
patching file src/backend/commands/tsearchcmds.c
patching file src/backend/commands/user.c
patching file src/backend/commands/vacuumparallel.c
patching file src/backend/commands/view.c
patching file src/backend/executor/execCurrent.c
patching file src/backend/executor/execExprInterp.c
patching file src/backend/executor/execGrouping.c
patching file src/backend/executor/execParallel.c
patching file src/backend/executor/execPartition.c
Hunk #3 succeeded at 1851 (offset -4 lines).
patching file src/backend/executor/execReplication.c
patching file src/backend/executor/execUtils.c
patching file src/backend/executor/functions.c
patching file src/backend/executor/instrument.c
patching file src/backend/executor/nodeAgg.c
patching file src/backend/executor/nodeGatherMerge.c
patching file src/backend/executor/nodeIncrementalSort.c
patching file src/backend/executor/nodeIndexonlyscan.c
patching file src/backend/executor/nodeIndexscan.c
patching file src/backend/executor/nodeLimit.c
patching file src/backend/executor/nodeMemoize.c
patching file src/backend/executor/nodeMergejoin.c
patching file src/backend/executor/nodeModifyTable.c
patching file src/backend/executor/nodeSetOp.c
patching file src/backend/executor/nodeSubplan.c
patching file src/backend/executor/nodeWindowAgg.c
patching file src/backend/executor/nodeWorktablescan.c
patching file src/backend/executor/spi.c
patching file src/backend/jit/llvm/llvmjit_expr.c
patching file src/backend/lib/dshash.c
patching file src/backend/lib/integerset.c
patching file src/backend/lib/pairingheap.c
patching file src/backend/lib/rbtree.c
patching file src/backend/libpq/auth-scram.c
patching file src/backend/libpq/auth.c
patching file src/backend/nodes/nodeFuncs.c
patching file src/backend/nodes/tidbitmap.c
patching file src/backend/optimizer/geqo/geqo_erx.c
patching file src/backend/optimizer/geqo/geqo_misc.c
patching file src/backend/optimizer/path/costsize.c
patching file src/backend/optimizer/path/equivclass.c
patching file src/backend/optimizer/path/indxpath.c
patching file src/backend/optimizer/path/joinpath.c
patching file src/backend/optimizer/path/pathkeys.c
patching file src/backend/optimizer/path/tidpath.c
patching file src/backend/optimizer/plan/analyzejoins.c
patching file src/backend/optimizer/plan/createplan.c
patching file src/backend/optimizer/plan/initsplan.c
patching file src/backend/optimizer/plan/planagg.c
patching file src/backend/optimizer/plan/planner.c
patching file src/backend/optimizer/plan/subselect.c
patching file src/backend/optimizer/prep/prepagg.c
patching file src/backend/optimizer/prep/prepqual.c
patching file src/backend/optimizer/prep/prepunion.c
patching file src/backend/optimizer/util/clauses.c
patching file src/backend/optimizer/util/inherit.c
patching file src/backend/optimizer/util/pathnode.c
patching file src/backend/optimizer/util/plancat.c
patching file src/backend/optimizer/util/relnode.c
patching file src/backend/optimizer/util/tlist.c
patching file src/backend/parser/analyze.c
patching file src/backend/parser/parse_collate.c
patching file src/backend/parser/parse_expr.c
patching file src/backend/parser/parse_func.c
patching file src/backend/parser/parse_merge.c
patching file src/backend/parser/parse_relation.c
patching file src/backend/parser/parse_utilcmd.c
Hunk #1 FAILED at 128.
Hunk #2 succeeded at 2945 (offset 3 lines).
Hunk #3 succeeded at 4200 (offset 313 lines).
Hunk #4 succeeded at 4742 (offset 313 lines).
Hunk #5 succeeded at 4859 (offset 313 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/backend/parser/parse_utilcmd.c.rej
patching file src/backend/partitioning/partbounds.c
Hunk #1 succeeded at 104 (offset 1 line).
Hunk #2 succeeded at 118 (offset 1 line).
Hunk #3 succeeded at 164 (offset 1 line).
Hunk #4 succeeded at 215 (offset 1 line).
Hunk #5 succeeded at 234 (offset 1 line).
Hunk #6 succeeded at 1194 (offset 1 line).
Hunk #7 succeeded at 1807 (offset 1 line).
Hunk #8 succeeded at 1839 (offset 1 line).
Hunk #9 succeeded at 2381 (offset 1 line).
Hunk #10 succeeded at 2436 (offset 1 line).
Hunk #11 succeeded at 3426 (offset 1 line).
Hunk #12 succeeded at 3487 (offset 1 line).
Hunk #13 succeeded at 4066 (offset 1 line).
patching file src/backend/postmaster/autovacuum.c
patching file src/backend/postmaster/postmaster.c
patching file src/backend/regex/regprefix.c
patching file src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
patching file src/backend/replication/logical/launcher.c
patching file src/backend/replication/logical/relation.c
patching file src/backend/replication/logical/reorderbuffer.c
patching file src/backend/replication/logical/sequencesync.c
patching file src/backend/replication/logical/slotsync.c
Hunk #1 succeeded at 430 (offset 11 lines).
patching file src/backend/replication/logical/snapbuild.c
patching file src/backend/replication/logical/tablesync.c
patching file src/backend/replication/logical/worker.c
patching file src/backend/replication/pgoutput/pgoutput.c
patching file src/backend/replication/slot.c
patching file src/backend/replication/syncrep.c
patching file src/backend/replication/walsender.c
patching file src/backend/rewrite/rewriteDefine.c
patching file src/backend/rewrite/rowsecurity.c
patching file src/backend/statistics/dependencies.c
patching file src/backend/statistics/mvdistinct.c
patching file src/backend/storage/aio/aio.c
patching file src/backend/storage/aio/read_stream.c
patching file src/backend/storage/buffer/bufmgr.c
Hunk #1 succeeded at 625 (offset 94 lines).
Hunk #2 succeeded at 1600 (offset 94 lines).
patching file src/backend/storage/ipc/procarray.c
patching file src/backend/storage/ipc/waiteventset.c
Hunk #2 succeeded at 787 (offset -1 lines).
Hunk #3 succeeded at 836 (offset -1 lines).
Hunk #4 succeeded at 847 (offset -1 lines).
Hunk #5 succeeded at 860 (offset -1 lines).
Hunk #6 succeeded at 983 with fuzz 2 (offset 1 line).
patching file src/backend/storage/lmgr/lock.c
patching file src/backend/storage/lmgr/lwlock.c
patching file src/backend/tcop/fastpath.c
patching file src/backend/tcop/postgres.c
patching file src/backend/tsearch/dict_thesaurus.c
patching file src/backend/tsearch/ts_parse.c
patching file src/backend/tsearch/wparser_def.c
patching file src/backend/utils/activity/pgstat_backend.c
patching file src/backend/utils/adt/array_userfuncs.c
patching file src/backend/utils/adt/arrayfuncs.c
patching file src/backend/utils/adt/ascii.c
patching file src/backend/utils/adt/date.c
patching file src/backend/utils/adt/formatting.c
patching file src/backend/utils/adt/geo_spgist.c
patching file src/backend/utils/adt/jsonb.c
patching file src/backend/utils/adt/jsonb_util.c
patching file src/backend/utils/adt/jsonfuncs.c
patching file src/backend/utils/adt/jsonpath_exec.c
patching file src/backend/utils/adt/network_gist.c
patching file src/backend/utils/adt/network_selfuncs.c
patching file src/backend/utils/adt/numeric.c
patching file src/backend/utils/adt/pg_locale.c
patching file src/backend/utils/adt/pgstatfuncs.c
patching file src/backend/utils/adt/rangetypes.c
patching file src/backend/utils/adt/rangetypes_gist.c
patching file src/backend/utils/adt/regexp.c
patching file src/backend/utils/adt/selfuncs.c
patching file src/backend/utils/adt/tsquery_util.c
patching file src/backend/utils/adt/varlena.c
Hunk #3 succeeded at 3184 (offset -27 lines).
patching file src/backend/utils/cache/catcache.c
patching file src/backend/utils/cache/plancache.c
patching file src/backend/utils/cache/relcache.c
patching file src/backend/utils/fmgr/funcapi.c
patching file src/backend/utils/hash/dynahash.c
patching file src/backend/utils/misc/guc.c
patching file src/backend/utils/mmgr/freepage.c
patching file src/backend/utils/mmgr/generation.c
patching file src/backend/utils/mmgr/slab.c
patching file src/backend/utils/sort/sharedtuplestore.c
patching file src/backend/utils/sort/tuplesort.c
patching file src/bin/initdb/findtimezone.c
patching file src/bin/pg_basebackup/pg_basebackup.c
patching file src/bin/pg_basebackup/receivelog.c
patching file src/bin/pg_combinebackup/backup_label.c
patching file src/bin/pg_combinebackup/pg_combinebackup.c
patching file src/bin/pg_combinebackup/reconstruct.c
patching file src/bin/pg_dump/common.c
patching file src/bin/pg_dump/compress_gzip.c
patching file src/bin/pg_dump/compress_zstd.c
patching file src/bin/pg_dump/parallel.c
patching file src/bin/pg_dump/pg_backup_archiver.c
patching file src/bin/pg_dump/pg_backup_custom.c
patching file src/bin/pg_dump/pg_backup_directory.c
patching file src/bin/pg_dump/pg_backup_tar.c
patching file src/bin/pg_dump/pg_dumpall.c
patching file src/bin/pg_rewind/pg_rewind.c
patching file src/bin/pg_upgrade/info.c
patching file src/bin/pg_waldump/pg_waldump.c
patching file src/bin/pg_walsummary/pg_walsummary.c
patching file src/bin/pgbench/pgbench.c
patching file src/bin/psql/crosstabview.c
patching file src/bin/scripts/clusterdb.c
patching file src/bin/scripts/reindexdb.c
patching file src/bin/scripts/vacuuming.c
patching file src/common/parse_manifest.c
patching file src/common/pg_lzcompress.c
patching file src/interfaces/ecpg/ecpglib/execute.c
patching file src/interfaces/ecpg/pgtypeslib/interval.c
patching file src/interfaces/ecpg/pgtypeslib/numeric.c
patching file src/interfaces/ecpg/preproc/type.c
patching file src/interfaces/libpq/fe-print.c
patching file src/pl/plperl/plperl.c
patching file src/pl/plpgsql/src/pl_exec.c
patching file src/pl/plpgsql/src/pl_funcs.c
patching file src/pl/plpgsql/src/pl_scanner.c
patching file src/pl/plpython/plpy_exec.c
patching file src/pl/plpython/plpy_typeio.c
patching file src/pl/tcl/pltcl.c
patching file src/test/modules/injection_points/injection_points.c
patching file src/test/modules/libpq_pipeline/libpq_pipeline.c
patching file src/test/modules/test_radixtree/test_radixtree.c
patching file src/test/modules/test_regex/test_regex.c
patching file src/test/modules/test_resowner/test_resowner_many.c
patching file src/test/modules/test_shm_mq/setup.c
patching file src/test/modules/test_shm_mq/test.c
patching file src/test/regress/regress.c
Hunk #1 succeeded at 84 (offset 4 lines).
Hunk #2 succeeded at 138 (offset 4 lines).
Unstaged changes after reset:
M	contrib/bloom/blinsert.c
M	contrib/dblink/dblink.c
M	contrib/file_fdw/file_fdw.c
M	contrib/fuzzystrmatch/dmetaphone.c
M	contrib/fuzzystrmatch/fuzzystrmatch.c
M	contrib/intarray/_int_bool.c
M	contrib/isn/isn.c
M	contrib/jsonb_plpython/jsonb_plpython.c
M	contrib/ltree/lquery_op.c
M	contrib/pg_trgm/trgm_op.c
M	contrib/pg_trgm/trgm_regexp.c
M	contrib/pg_walinspect/pg_walinspect.c
M	contrib/pgcrypto/pgp-info.c
M	contrib/pgcrypto/pgp-pgsql.c
M	contrib/pgcrypto/pgp-pubdec.c
M	contrib/pgcrypto/pgp-pubkey.c
M	contrib/seg/seg.c
M	contrib/test_decoding/test_decoding.c
M	contrib/xml2/xpath.c
M	src/backend/access/brin/brin.c
M	src/backend/access/brin/brin_bloom.c
M	src/backend/access/brin/brin_tuple.c
M	src/backend/access/common/attmap.c
M	src/backend/access/common/printtup.c
M	src/backend/access/common/reloptions.c
M	src/backend/access/gin/ginentrypage.c
M	src/backend/access/gin/ginfast.c
M	src/backend/access/gin/ginscan.c
M	src/backend/access/gist/gistbuild.c
M	src/backend/access/gist/gistproc.c
M	src/backend/access/gist/gistsplit.c
M	src/backend/access/hash/hashsearch.c
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/pruneheap.c
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/access/nbtree/nbtinsert.c
M	src/backend/access/nbtree/nbtreadpage.c
M	src/backend/access/nbtree/nbtsort.c
M	src/backend/access/nbtree/nbtsplitloc.c
M	src/backend/access/rmgrdesc/xactdesc.c
M	src/backend/access/spgist/spgdoinsert.c
M	src/backend/access/spgist/spgkdtreeproc.c
M	src/backend/access/spgist/spgproc.c
M	src/backend/access/spgist/spgquadtreeproc.c
M	src/backend/access/spgist/spgscan.c
M	src/backend/access/spgist/spgutils.c
M	src/backend/access/transam/commit_ts.c
M	src/backend/access/transam/multixact.c
M	src/backend/access/transam/xlog.c
M	src/backend/access/transam/xlogprefetcher.c
M	src/backend/backup/backup_manifest.c
M	src/backend/backup/basebackup_copy.c
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/namespace.c
M	src/backend/catalog/pg_enum.c
M	src/backend/catalog/pg_publication.c
M	src/backend/commands/analyze.c
M	src/backend/commands/cluster.c
M	src/backend/commands/copyfrom.c
M	src/backend/commands/copyto.c
M	src/backend/commands/createas.c
M	src/backend/commands/dropcmds.c
M	src/backend/commands/extension.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/prepare.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/subscriptioncmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/user.c
M	src/backend/commands/vacuumparallel.c
M	src/backend/commands/view.c
M	src/backend/executor/execCurrent.c
M	src/backend/executor/execExprInterp.c
M	src/backend/executor/execGrouping.c
M	src/backend/executor/execParallel.c
M	src/backend/executor/execPartition.c
M	src/backend/executor/execReplication.c
M	src/backend/executor/execUtils.c
M	src/backend/executor/functions.c
M	src/backend/executor/instrument.c
M	src/backend/executor/nodeAgg.c
M	src/backend/executor/nodeGatherMerge.c
M	src/backend/executor/nodeIncrementalSort.c
M	src/backend/executor/nodeIndexonlyscan.c
M	src/backend/executor/nodeIndexscan.c
M	src/backend/executor/nodeLimit.c
M	src/backend/executor/nodeMemoize.c
M	src/backend/executor/nodeMergejoin.c
M	src/backend/executor/nodeModifyTable.c
M	src/backend/executor/nodeSetOp.c
M	src/backend/executor/nodeSubplan.c
M	src/backend/executor/nodeWindowAgg.c
M	src/backend/executor/nodeWorktablescan.c
M	src/backend/executor/spi.c
M	src/backend/jit/llvm/llvmjit_expr.c
M	src/backend/lib/dshash.c
M	src/backend/lib/integerset.c
M	src/backend/lib/pairingheap.c
M	src/backend/lib/rbtree.c
M	src/backend/libpq/auth-scram.c
M	src/backend/libpq/auth.c
M	src/backend/nodes/nodeFuncs.c
M	src/backend/nodes/tidbitmap.c
M	src/backend/optimizer/geqo/geqo_erx.c
M	src/backend/optimizer/geqo/geqo_misc.c
M	src/backend/optimizer/path/costsize.c
M	src/backend/optimizer/path/equivclass.c
M	src/backend/optimizer/path/indxpath.c
M	src/backend/optimizer/path/joinpath.c
M	src/backend/optimizer/path/pathkeys.c
M	src/backend/optimizer/path/tidpath.c
M	src/backend/optimizer/plan/analyzejoins.c
M	src/backend/optimizer/plan/createplan.c
M	src/backend/optimizer/plan/initsplan.c
M	src/backend/optimizer/plan/planagg.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/plan/subselect.c
M	src/backend/optimizer/prep/prepagg.c
M	src/backend/optimizer/prep/prepqual.c
M	src/backend/optimizer/prep/prepunion.c
M	src/backend/optimizer/util/clauses.c
M	src/backend/optimizer/util/inherit.c
M	src/backend/optimizer/util/pathnode.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/optimizer/util/relnode.c
M	src/backend/optimizer/util/tlist.c
M	src/backend/parser/analyze.c
M	src/backend/parser/parse_collate.c
M	src/backend/parser/parse_expr.c
M	src/backend/parser/parse_func.c
M	src/backend/parser/parse_merge.c
M	src/backend/parser/parse_relation.c
M	src/backend/parser/parse_utilcmd.c
M	src/backend/partitioning/partbounds.c
M	src/backend/postmaster/autovacuum.c
M	src/backend/postmaster/postmaster.c
M	src/backend/regex/regprefix.c
M	src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
M	src/backend/replication/logical/launcher.c
M	src/backend/replication/logical/relation.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/replication/logical/sequencesync.c
M	src/backend/replication/logical/slotsync.c
M	src/backend/replication/logical/snapbuild.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/replication/slot.c
M	src/backend/replication/syncrep.c
M	src/backend/replication/walsender.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/rewrite/rowsecurity.c
M	src/backend/statistics/dependencies.c
M	src/backend/statistics/mvdistinct.c
M	src/backend/storage/aio/aio.c
M	src/backend/storage/aio/read_stream.c
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/ipc/procarray.c
M	src/backend/storage/ipc/waiteventset.c
M	src/backend/storage/lmgr/lock.c
M	src/backend/storage/lmgr/lwlock.c
M	src/backend/tcop/fastpath.c
M	src/backend/tcop/postgres.c
M	src/backend/tsearch/dict_thesaurus.c
M	src/backend/tsearch/ts_parse.c
M	src/backend/tsearch/wparser_def.c
M	src/backend/utils/activity/pgstat_backend.c
M	src/backend/utils/adt/array_userfuncs.c
M	src/backend/utils/adt/arrayfuncs.c
M	src/backend/utils/adt/ascii.c
M	src/backend/utils/adt/date.c
M	src/backend/utils/adt/formatting.c
M	src/backend/utils/adt/geo_spgist.c
M	src/backend/utils/adt/jsonb.c
M	src/backend/utils/adt/jsonb_util.c
M	src/backend/utils/adt/jsonfuncs.c
M	src/backend/utils/adt/jsonpath_exec.c
M	src/backend/utils/adt/network_gist.c
M	src/backend/utils/adt/network_selfuncs.c
M	src/backend/utils/adt/numeric.c
M	src/backend/utils/adt/pg_locale.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/backend/utils/adt/rangetypes.c
M	src/backend/utils/adt/rangetypes_gist.c
M	src/backend/utils/adt/regexp.c
M	src/backend/utils/adt/selfuncs.c
M	src/backend/utils/adt/tsquery_util.c
M	src/backend/utils/adt/varlena.c
M	src/backend/utils/cache/catcache.c
M	src/backend/utils/cache/plancache.c
M	src/backend/utils/cache/relcache.c
M	src/backend/utils/fmgr/funcapi.c
M	src/backend/utils/hash/dynahash.c
M	src/backend/utils/misc/guc.c
M	src/backend/utils/mmgr/freepage.c
M	src/backend/utils/mmgr/generation.c
M	src/backend/utils/mmgr/slab.c
M	src/backend/utils/sort/sharedtuplestore.c
M	src/backend/utils/sort/tuplesort.c
M	src/bin/initdb/findtimezone.c
M	src/bin/pg_basebackup/pg_basebackup.c
M	src/bin/pg_basebackup/receivelog.c
M	src/bin/pg_combinebackup/backup_label.c
M	src/bin/pg_combinebackup/pg_combinebackup.c
M	src/bin/pg_combinebackup/reconstruct.c
M	src/bin/pg_dump/common.c
M	src/bin/pg_dump/compress_gzip.c
M	src/bin/pg_dump/compress_zstd.c
M	src/bin/pg_dump/parallel.c
M	src/bin/pg_dump/pg_backup_archiver.c
M	src/bin/pg_dump/pg_backup_custom.c
M	src/bin/pg_dump/pg_backup_directory.c
M	src/bin/pg_dump/pg_backup_tar.c
M	src/bin/pg_dump/pg_dumpall.c
M	src/bin/pg_rewind/pg_rewind.c
M	src/bin/pg_upgrade/info.c
M	src/bin/pg_waldump/pg_waldump.c
M	src/bin/pg_walsummary/pg_walsummary.c
M	src/bin/pgbench/pgbench.c
M	src/bin/psql/crosstabview.c
M	src/bin/scripts/clusterdb.c
M	src/bin/scripts/reindexdb.c
M	src/bin/scripts/vacuuming.c
M	src/common/parse_manifest.c
M	src/common/pg_lzcompress.c
M	src/interfaces/ecpg/ecpglib/execute.c
M	src/interfaces/ecpg/pgtypeslib/interval.c
M	src/interfaces/ecpg/pgtypeslib/numeric.c
M	src/interfaces/ecpg/preproc/type.c
M	src/interfaces/libpq/fe-print.c
M	src/pl/plperl/plperl.c
M	src/pl/plpgsql/src/pl_exec.c
M	src/pl/plpgsql/src/pl_funcs.c
M	src/pl/plpgsql/src/pl_scanner.c
M	src/pl/plpython/plpy_exec.c
M	src/pl/plpython/plpy_typeio.c
M	src/pl/tcl/pltcl.c
M	src/test/modules/injection_points/injection_points.c
M	src/test/modules/libpq_pipeline/libpq_pipeline.c
M	src/test/modules/test_radixtree/test_radixtree.c
M	src/test/modules/test_regex/test_regex.c
M	src/test/modules/test_resowner/test_resowner_many.c
M	src/test/modules/test_shm_mq/setup.c
M	src/test/modules/test_shm_mq/test.c
M	src/test/regress/regress.c
Removing src/backend/access/heap/pruneheap.c.rej
Removing src/backend/parser/parse_utilcmd.c.rej
=== using 'git apply' to apply patch ./v2-0001-Mark-function-arguments-of-type-T-as-const-T-wher.patch ===
Applied patch to 'contrib/bloom/blinsert.c' cleanly.
Applied patch to 'contrib/dblink/dblink.c' cleanly.
Applied patch to 'contrib/file_fdw/file_fdw.c' cleanly.
Applied patch to 'contrib/fuzzystrmatch/dmetaphone.c' cleanly.
Applied patch to 'contrib/fuzzystrmatch/fuzzystrmatch.c' cleanly.
Applied patch to 'contrib/intarray/_int_bool.c' cleanly.
Applied patch to 'contrib/isn/isn.c' cleanly.
Applied patch to 'contrib/jsonb_plpython/jsonb_plpython.c' cleanly.
Applied patch to 'contrib/ltree/lquery_op.c' cleanly.
Applied patch to 'contrib/pg_trgm/trgm_op.c' cleanly.
Applied patch to 'contrib/pg_trgm/trgm_regexp.c' cleanly.
Applied patch to 'contrib/pg_walinspect/pg_walinspect.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-info.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-pgsql.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-pubdec.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-pubkey.c' cleanly.
Applied patch to 'contrib/seg/seg.c' cleanly.
Applied patch to 'contrib/test_decoding/test_decoding.c' cleanly.
Applied patch to 'contrib/xml2/xpath.c' cleanly.
Applied patch to 'src/backend/access/brin/brin.c' cleanly.
Applied patch to 'src/backend/access/brin/brin_bloom.c' cleanly.
Applied patch to 'src/backend/access/brin/brin_tuple.c' cleanly.
Applied patch to 'src/backend/access/common/attmap.c' cleanly.
Applied patch to 'src/backend/access/common/printtup.c' cleanly.
Applied patch to 'src/backend/access/common/reloptions.c' cleanly.
Applied patch to 'src/backend/access/gin/ginentrypage.c' cleanly.
Applied patch to 'src/backend/access/gin/ginfast.c' cleanly.
Applied patch to 'src/backend/access/gin/ginscan.c' cleanly.
Applied patch to 'src/backend/access/gist/gistbuild.c' cleanly.
Applied patch to 'src/backend/access/gist/gistproc.c' cleanly.
Applied patch to 'src/backend/access/gist/gistsplit.c' cleanly.
Applied patch to 'src/backend/access/hash/hashsearch.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam.c' cleanly.
Applied patch to 'src/backend/access/heap/pruneheap.c' with conflicts.
Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtinsert.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtreadpage.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtsort.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtsplitloc.c' cleanly.
Applied patch to 'src/backend/access/rmgrdesc/xactdesc.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgdoinsert.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgkdtreeproc.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgproc.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgquadtreeproc.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgscan.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgutils.c' cleanly.
Applied patch to 'src/backend/access/transam/commit_ts.c' cleanly.
Applied patch to 'src/backend/access/transam/multixact.c' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogprefetcher.c' cleanly.
Applied patch to 'src/backend/backup/backup_manifest.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_copy.c' cleanly.
Applied patch to 'src/backend/catalog/aclchk.c' cleanly.
Applied patch to 'src/backend/catalog/dependency.c' cleanly.
Applied patch to 'src/backend/catalog/heap.c' cleanly.
Applied patch to 'src/backend/catalog/namespace.c' cleanly.
Applied patch to 'src/backend/catalog/pg_enum.c' cleanly.
Applied patch to 'src/backend/catalog/pg_publication.c' cleanly.
Applied patch to 'src/backend/commands/analyze.c' cleanly.
Applied patch to 'src/backend/commands/cluster.c' cleanly.
Applied patch to 'src/backend/commands/copyfrom.c' cleanly.
Applied patch to 'src/backend/commands/copyto.c' cleanly.
Applied patch to 'src/backend/commands/createas.c' cleanly.
Applied patch to 'src/backend/commands/dropcmds.c' cleanly.
Applied patch to 'src/backend/commands/extension.c' cleanly.
Applied patch to 'src/backend/commands/foreigncmds.c' cleanly.
Applied patch to 'src/backend/commands/functioncmds.c' cleanly.
Applied patch to 'src/backend/commands/opclasscmds.c' cleanly.
Applied patch to 'src/backend/commands/prepare.c' cleanly.
Applied patch to 'src/backend/commands/sequence.c' cleanly.
Applied patch to 'src/backend/commands/statscmds.c' cleanly.
Applied patch to 'src/backend/commands/subscriptioncmds.c' cleanly.
Applied patch to 'src/backend/commands/trigger.c' cleanly.
Applied patch to 'src/backend/commands/tsearchcmds.c' cleanly.
Applied patch to 'src/backend/commands/user.c' cleanly.
Applied patch to 'src/backend/commands/vacuumparallel.c' cleanly.
Applied patch to 'src/backend/commands/view.c' cleanly.
Applied patch to 'src/backend/executor/execCurrent.c' cleanly.
Applied patch to 'src/backend/executor/execExprInterp.c' cleanly.
Applied patch to 'src/backend/executor/execGrouping.c' cleanly.
Applied patch to 'src/backend/executor/execParallel.c' cleanly.
Applied patch to 'src/backend/executor/execPartition.c' cleanly.
Applied patch to 'src/backend/executor/execReplication.c' cleanly.
Applied patch to 'src/backend/executor/execUtils.c' cleanly.
Applied patch to 'src/backend/executor/functions.c' cleanly.
Applied patch to 'src/backend/executor/instrument.c' cleanly.
Applied patch to 'src/backend/executor/nodeAgg.c' cleanly.
Applied patch to 'src/backend/executor/nodeGatherMerge.c' cleanly.
Applied patch to 'src/backend/executor/nodeIncrementalSort.c' cleanly.
Applied patch to 'src/backend/executor/nodeIndexonlyscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeIndexscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeLimit.c' cleanly.
Applied patch to 'src/backend/executor/nodeMemoize.c' cleanly.
Applied patch to 'src/backend/executor/nodeMergejoin.c' cleanly.
Applied patch to 'src/backend/executor/nodeModifyTable.c' cleanly.
Applied patch to 'src/backend/executor/nodeSetOp.c' cleanly.
Applied patch to 'src/backend/executor/nodeSubplan.c' cleanly.
Applied patch to 'src/backend/executor/nodeWindowAgg.c' cleanly.
Applied patch to 'src/backend/executor/nodeWorktablescan.c' cleanly.
Applied patch to 'src/backend/executor/spi.c' cleanly.
Applied patch to 'src/backend/jit/llvm/llvmjit_expr.c' cleanly.
Applied patch to 'src/backend/lib/dshash.c' cleanly.
Applied patch to 'src/backend/lib/integerset.c' cleanly.
Applied patch to 'src/backend/lib/pairingheap.c' cleanly.
Applied patch to 'src/backend/lib/rbtree.c' cleanly.
Applied patch to 'src/backend/libpq/auth-scram.c' cleanly.
Applied patch to 'src/backend/libpq/auth.c' cleanly.
Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly.
Applied patch to 'src/backend/nodes/tidbitmap.c' cleanly.
Applied patch to 'src/backend/optimizer/geqo/geqo_erx.c' cleanly.
Applied patch to 'src/backend/optimizer/geqo/geqo_misc.c' cleanly.
Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly.
Applied patch to 'src/backend/optimizer/path/equivclass.c' cleanly.
Applied patch to 'src/backend/optimizer/path/indxpath.c' cleanly.
Applied patch to 'src/backend/optimizer/path/joinpath.c' cleanly.
Applied patch to 'src/backend/optimizer/path/pathkeys.c' cleanly.
Applied patch to 'src/backend/optimizer/path/tidpath.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/analyzejoins.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/createplan.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/initsplan.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/planagg.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/planner.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/subselect.c' cleanly.
Applied patch to 'src/backend/optimizer/prep/prepagg.c' cleanly.
Applied patch to 'src/backend/optimizer/prep/prepqual.c' cleanly.
Applied patch to 'src/backend/optimizer/prep/prepunion.c' cleanly.
Applied patch to 'src/backend/optimizer/util/clauses.c' cleanly.
Applied patch to 'src/backend/optimizer/util/inherit.c' cleanly.
Applied patch to 'src/backend/optimizer/util/pathnode.c' cleanly.
Applied patch to 'src/backend/optimizer/util/plancat.c' cleanly.
Applied patch to 'src/backend/optimizer/util/relnode.c' cleanly.
Applied patch to 'src/backend/optimizer/util/tlist.c' cleanly.
Applied patch to 'src/backend/parser/analyze.c' cleanly.
Applied patch to 'src/backend/parser/parse_collate.c' cleanly.
Applied patch to 'src/backend/parser/parse_expr.c' cleanly.
Applied patch to 'src/backend/parser/parse_func.c' cleanly.
Applied patch to 'src/backend/parser/parse_merge.c' cleanly.
Applied patch to 'src/backend/parser/parse_relation.c' cleanly.
Applied patch to 'src/backend/parser/parse_utilcmd.c' with conflicts.
Applied patch to 'src/backend/partitioning/partbounds.c' cleanly.
Applied patch to 'src/backend/postmaster/autovacuum.c' cleanly.
Applied patch to 'src/backend/postmaster/postmaster.c' cleanly.
Applied patch to 'src/backend/regex/regprefix.c' cleanly.
Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly.
Applied patch to 'src/backend/replication/logical/launcher.c' cleanly.
Applied patch to 'src/backend/replication/logical/relation.c' cleanly.
Applied patch to 'src/backend/replication/logical/reorderbuffer.c' cleanly.
Applied patch to 'src/backend/replication/logical/sequencesync.c' cleanly.
Applied patch to 'src/backend/replication/logical/slotsync.c' cleanly.
Applied patch to 'src/backend/replication/logical/snapbuild.c' cleanly.
Applied patch to 'src/backend/replication/logical/tablesync.c' cleanly.
Applied patch to 'src/backend/replication/logical/worker.c' cleanly.
Applied patch to 'src/backend/replication/pgoutput/pgoutput.c' cleanly.
Applied patch to 'src/backend/replication/slot.c' cleanly.
Applied patch to 'src/backend/replication/syncrep.c' cleanly.
Applied patch to 'src/backend/replication/walsender.c' cleanly.
Applied patch to 'src/backend/rewrite/rewriteDefine.c' cleanly.
Applied patch to 'src/backend/rewrite/rowsecurity.c' cleanly.
Applied patch to 'src/backend/statistics/dependencies.c' cleanly.
Applied patch to 'src/backend/statistics/mvdistinct.c' cleanly.
Applied patch to 'src/backend/storage/aio/aio.c' cleanly.
Applied patch to 'src/backend/storage/aio/read_stream.c' cleanly.
Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly.
Applied patch to 'src/backend/storage/ipc/procarray.c' cleanly.
Applied patch to 'src/backend/storage/ipc/waiteventset.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/lock.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/lwlock.c' cleanly.
Applied patch to 'src/backend/tcop/fastpath.c' cleanly.
Applied patch to 'src/backend/tcop/postgres.c' cleanly.
Applied patch to 'src/backend/tsearch/dict_thesaurus.c' cleanly.
Applied patch to 'src/backend/tsearch/ts_parse.c' cleanly.
Applied patch to 'src/backend/tsearch/wparser_def.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_backend.c' cleanly.
Applied patch to 'src/backend/utils/adt/array_userfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/arrayfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/ascii.c' cleanly.
Applied patch to 'src/backend/utils/adt/date.c' cleanly.
Applied patch to 'src/backend/utils/adt/formatting.c' cleanly.
Applied patch to 'src/backend/utils/adt/geo_spgist.c' cleanly.
Applied patch to 'src/backend/utils/adt/jsonb.c' cleanly.
Applied patch to 'src/backend/utils/adt/jsonb_util.c' cleanly.
Applied patch to 'src/backend/utils/adt/jsonfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/jsonpath_exec.c' cleanly.
Applied patch to 'src/backend/utils/adt/network_gist.c' cleanly.
Applied patch to 'src/backend/utils/adt/network_selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/numeric.c' cleanly.
Applied patch to 'src/backend/utils/adt/pg_locale.c' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/rangetypes.c' cleanly.
Applied patch to 'src/backend/utils/adt/rangetypes_gist.c' cleanly.
Applied patch to 'src/backend/utils/adt/regexp.c' cleanly.
Applied patch to 'src/backend/utils/adt/selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsquery_util.c' cleanly.
Applied patch to 'src/backend/utils/adt/varlena.c' cleanly.
Applied patch to 'src/backend/utils/cache/catcache.c' cleanly.
Applied patch to 'src/backend/utils/cache/plancache.c' cleanly.
Applied patch to 'src/backend/utils/cache/relcache.c' cleanly.
Applied patch to 'src/backend/utils/fmgr/funcapi.c' cleanly.
Applied patch to 'src/backend/utils/hash/dynahash.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc.c' cleanly.
Applied patch to 'src/backend/utils/mmgr/freepage.c' cleanly.
Applied patch to 'src/backend/utils/mmgr/generation.c' cleanly.
Applied patch to 'src/backend/utils/mmgr/slab.c' cleanly.
Applied patch to 'src/backend/utils/sort/sharedtuplestore.c' cleanly.
Applied patch to 'src/backend/utils/sort/tuplesort.c' cleanly.
Applied patch to 'src/bin/initdb/findtimezone.c' cleanly.
Applied patch to 'src/bin/pg_basebackup/pg_basebackup.c' cleanly.
Applied patch to 'src/bin/pg_basebackup/receivelog.c' cleanly.
Applied patch to 'src/bin/pg_combinebackup/backup_label.c' cleanly.
Applied patch to 'src/bin/pg_combinebackup/pg_combinebackup.c' cleanly.
Applied patch to 'src/bin/pg_combinebackup/reconstruct.c' cleanly.
Applied patch to 'src/bin/pg_dump/common.c' cleanly.
Applied patch to 'src/bin/pg_dump/compress_gzip.c' cleanly.
Applied patch to 'src/bin/pg_dump/compress_zstd.c' cleanly.
Applied patch to 'src/bin/pg_dump/parallel.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_custom.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_directory.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_tar.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dumpall.c' cleanly.
Applied patch to 'src/bin/pg_rewind/pg_rewind.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/info.c' cleanly.
Applied patch to 'src/bin/pg_waldump/pg_waldump.c' cleanly.
Applied patch to 'src/bin/pg_walsummary/pg_walsummary.c' cleanly.
Applied patch to 'src/bin/pgbench/pgbench.c' cleanly.
Applied patch to 'src/bin/psql/crosstabview.c' cleanly.
Applied patch to 'src/bin/scripts/clusterdb.c' cleanly.
Applied patch to 'src/bin/scripts/reindexdb.c' cleanly.
Applied patch to 'src/bin/scripts/vacuuming.c' cleanly.
Applied patch to 'src/common/parse_manifest.c' cleanly.
Applied patch to 'src/common/pg_lzcompress.c' cleanly.
Applied patch to 'src/interfaces/ecpg/ecpglib/execute.c' cleanly.
Applied patch to 'src/interfaces/ecpg/pgtypeslib/interval.c' cleanly.
Applied patch to 'src/interfaces/ecpg/pgtypeslib/numeric.c' cleanly.
Applied patch to 'src/interfaces/ecpg/preproc/type.c' cleanly.
Applied patch to 'src/interfaces/libpq/fe-print.c' cleanly.
Applied patch to 'src/pl/plperl/plperl.c' cleanly.
Applied patch to 'src/pl/plpgsql/src/pl_exec.c' cleanly.
Applied patch to 'src/pl/plpgsql/src/pl_funcs.c' cleanly.
Applied patch to 'src/pl/plpgsql/src/pl_scanner.c' cleanly.
Applied patch to 'src/pl/plpython/plpy_exec.c' cleanly.
Applied patch to 'src/pl/plpython/plpy_typeio.c' cleanly.
Applied patch to 'src/pl/tcl/pltcl.c' cleanly.
Applied patch to 'src/test/modules/injection_points/injection_points.c' cleanly.
Applied patch to 'src/test/modules/libpq_pipeline/libpq_pipeline.c' cleanly.
Applied patch to 'src/test/modules/test_radixtree/test_radixtree.c' cleanly.
Applied patch to 'src/test/modules/test_regex/test_regex.c' cleanly.
Applied patch to 'src/test/modules/test_resowner/test_resowner_many.c' cleanly.
Applied patch to 'src/test/modules/test_shm_mq/setup.c' cleanly.
Applied patch to 'src/test/modules/test_shm_mq/test.c' cleanly.
Applied patch to 'src/test/regress/regress.c' cleanly.
U src/backend/access/heap/pruneheap.c
U src/backend/parser/parse_utilcmd.c
diff --cc src/backend/access/heap/pruneheap.c
index 07aa08cfe14,bddac3ba90b..00000000000
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@@ -157,10 -157,10 +157,17 @@@ typedef struc
  } PruneState;
  
  /* Local functions */
++<<<<<<< ours
 +static void prune_freeze_setup(PruneFreezeParams *params,
 +							   TransactionId *new_relfrozen_xid,
 +							   MultiXactId *new_relmin_mxid,
 +							   PruneFreezeResult *presult,
++=======
+ static void prune_freeze_setup(const PruneFreezeParams *params,
+ 							   const TransactionId *new_relfrozen_xid,
+ 							   const MultiXactId *new_relmin_mxid,
+ 							   const PruneFreezeResult *presult,
++>>>>>>> theirs
  							   PruneState *prstate);
  static void prune_freeze_plan(Oid reloid, Buffer buffer,
  							  PruneState *prstate,
@@@ -322,15 -322,12 +329,22 @@@ heap_page_prune_opt(Relation relation, 
  /*
   * Helper for heap_page_prune_and_freeze() to initialize the PruneState using
   * the provided parameters.
 + *
 + * params, new_relfrozen_xid, new_relmin_mxid, and presult are input
 + * parameters and are not modified by this function. Only prstate is modified.
   */
  static void
++<<<<<<< ours
 +prune_freeze_setup(PruneFreezeParams *params,
 +				   TransactionId *new_relfrozen_xid,
 +				   MultiXactId *new_relmin_mxid,
 +				   PruneFreezeResult *presult,
++=======
+ prune_freeze_setup(const PruneFreezeParams *params,
+ 				   const TransactionId *new_relfrozen_xid,
+ 				   const MultiXactId *new_relmin_mxid,
+ 				   const PruneFreezeResult *presult,
++>>>>>>> theirs
  				   PruneState *prstate)
  {
  	/* Copy parameters to prstate */
diff --cc src/backend/parser/parse_utilcmd.c
index 2b7b084f216,4c2ac766df5..00000000000
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@@ -131,16 -128,17 +131,22 @@@ static IndexStmt *transformIndexConstra
  static void transformFKConstraints(CreateStmtContext *cxt,
  								   bool skipValidation,
  								   bool isAddConstraint);
- static void transformCheckConstraints(CreateStmtContext *cxt,
+ static void transformCheckConstraints(const CreateStmtContext *cxt,
  									  bool skipValidation);
  static void transformConstraintAttrs(CreateStmtContext *cxt,
- 									 List *constraintList);
+ 									 const List *constraintList);
  static void transformColumnType(CreateStmtContext *cxt, ColumnDef *column);
  static void setSchemaName(const char *context_schema, char **stmt_schema_name);
++<<<<<<< ours
 +static void transformPartitionCmd(CreateStmtContext *cxt, PartitionBoundSpec *bound);
 +static List *transformPartitionRangeBounds(ParseState *pstate, List *blist,
++=======
+ static void transformPartitionCmd(CreateStmtContext *cxt, PartitionCmd *cmd);
+ static List *transformPartitionRangeBounds(ParseState *pstate,
+ 										   const List *blist,
++>>>>>>> theirs
  										   Relation parent);
- static void validateInfiniteBounds(ParseState *pstate, List *blist);
+ static void validateInfiniteBounds(ParseState *pstate, const List *blist);
  static Const *transformPartitionBoundValue(ParseState *pstate, Node *val,
  										   const char *colName, Oid colType, int32 colTypmod,
  										   Oid partCollation);