=== Applying patches on top of PostgreSQL commit ID a1b4f289beec19534e5e34e1a962c5828b306ce2 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Feb 19 20:50:28 UTC 2025
On branch cf/5509
nothing to commit, working tree clean
=== applying patch ./0001-Add-initial-coccicheck-script.v2.patch
Falling back to direct application...
[cf/5509 53405236ce] Add initial coccicheck script
 Author: Mats Kindahl <mats@kindahl.net>
 Date: Sun Dec 29 19:35:58 2024 +0100
 1 file changed, 176 insertions(+)
 create mode 100755 src/tools/coccicheck.py
=== applying patch ./0002-Create-coccicheck-target-for-autoconf.v2.patch
Applied patch to 'configure' cleanly.
Applied patch to 'configure.ac' cleanly.
Applied patch to 'src/Makefile.global.in' cleanly.
Applied patch to 'src/makefiles/pgxs.mk' cleanly.
[cf/5509 cf69570b07] Create coccicheck target for autoconf
 Author: Mats Kindahl <mats@kindahl.net>
 Date: Mon Dec 30 19:58:07 2024 +0100
 4 files changed, 132 insertions(+), 7 deletions(-)
=== applying patch ./0003-Add-meson-build-for-coccicheck.v2.patch
/work/patches/./0003-Add-meson-build-for-coccicheck.v2.patch:131: trailing whitespace.
  
Applied patch to 'meson.build' cleanly.
Applied patch to 'meson_options.txt' cleanly.
Applied patch to 'src/makefiles/meson.build' cleanly.
warning: 1 line adds whitespace errors.
[cf/5509 6dfab868bc] Add meson build for coccicheck
 Author: Mats Kindahl <mats@kindahl.net>
 Date: Wed Jan 1 14:15:51 2025 +0100
 3 files changed, 38 insertions(+), 1 deletion(-)
=== applying patch ./0004-Add-semantic-patch-for-sizeof-using-palloc.v2.patch
Falling back to direct application...
Applied patch to 'contrib/btree_gist/btree_utils_var.c' cleanly.
Applied patch to 'src/backend/jit/llvm/llvmjit_expr.c' cleanly.
[cf/5509 39fb6a5176] Add semantic patch for sizeof() using palloc()
 Author: Mats Kindahl <mats@kindahl.net>
 Date: Sun Jan 5 19:26:47 2025 +0100
 3 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 cocci/palloc_sizeof.cocci
=== applying patch ./0005-Add-script-for-palloc_array.v2.patch
/work/patches/./0005-Add-script-for-palloc_array.v2.patch:1538: indent with spaces.
			       RelationGetDescr(indexRel)->natts);
/work/patches/./0005-Add-script-for-palloc_array.v2.patch:2501: indent with spaces.
				      (CONNECTBY_NCOLS + serial_column));
/work/patches/./0005-Add-script-for-palloc_array.v2.patch:2505: indent with spaces.
				      (CONNECTBY_NCOLS_NOBRANCH + serial_column));
/work/patches/./0005-Add-script-for-palloc_array.v2.patch:2738: indent with spaces.
						      max_custom_options);
/work/patches/./0005-Add-script-for-palloc_array.v2.patch:3258: indent with spaces.
					      splitPagesCount);
Falling back to direct application...
Applied patch to 'contrib/amcheck/verify_heapam.c' cleanly.
Applied patch to 'contrib/amcheck/verify_nbtree.c' cleanly.
Applied patch to 'contrib/basebackup_to_shell/basebackup_to_shell.c' cleanly.
Applied patch to 'contrib/bloom/blinsert.c' cleanly.
Applied patch to 'contrib/bloom/blutils.c' cleanly.
Applied patch to 'contrib/bloom/blvacuum.c' cleanly.
Applied patch to 'contrib/btree_gin/btree_gin.c' cleanly.
Applied patch to 'contrib/btree_gist/btree_inet.c' cleanly.
Applied patch to 'contrib/btree_gist/btree_interval.c' cleanly.
Applied patch to 'contrib/btree_gist/btree_time.c' cleanly.
Applied patch to 'contrib/btree_gist/btree_ts.c' cleanly.
Applied patch to 'contrib/btree_gist/btree_utils_num.c' cleanly.
Applied patch to 'contrib/btree_gist/btree_utils_var.c' cleanly.
Applied patch to 'contrib/btree_gist/btree_uuid.c' cleanly.
Applied patch to 'contrib/cube/cube.c' cleanly.
Applied patch to 'contrib/dict_int/dict_int.c' cleanly.
Applied patch to 'contrib/dict_xsyn/dict_xsyn.c' cleanly.
Applied patch to 'contrib/file_fdw/file_fdw.c' cleanly.
Applied patch to 'contrib/hstore/hstore_gin.c' cleanly.
Applied patch to 'contrib/hstore/hstore_gist.c' cleanly.
Applied patch to 'contrib/hstore/hstore_io.c' cleanly.
Applied patch to 'contrib/hstore/hstore_op.c' cleanly.
Applied patch to 'contrib/hstore_plperl/hstore_plperl.c' cleanly.
Applied patch to 'contrib/hstore_plpython/hstore_plpython.c' cleanly.
Applied patch to 'contrib/intarray/_int_bool.c' cleanly.
Applied patch to 'contrib/intarray/_int_gin.c' cleanly.
Applied patch to 'contrib/intarray/_int_gist.c' cleanly.
Applied patch to 'contrib/intarray/_intbig_gist.c' cleanly.
Applied patch to 'contrib/jsonb_plpython/jsonb_plpython.c' cleanly.
Applied patch to 'contrib/ltree/_ltree_gist.c' cleanly.
Applied patch to 'contrib/ltree/_ltree_op.c' cleanly.
Applied patch to 'contrib/ltree/ltree_gist.c' cleanly.
Applied patch to 'contrib/ltree/ltree_io.c' cleanly.
Applied patch to 'contrib/ltree/ltree_op.c' cleanly.
Applied patch to 'contrib/ltree/ltxtquery_io.c' cleanly.
Applied patch to 'contrib/pageinspect/brinfuncs.c' cleanly.
Applied patch to 'contrib/pageinspect/btreefuncs.c' cleanly.
Applied patch to 'contrib/pageinspect/ginfuncs.c' cleanly.
Applied patch to 'contrib/pageinspect/hashfuncs.c' cleanly.
Applied patch to 'contrib/pageinspect/heapfuncs.c' cleanly.
Applied patch to 'contrib/pg_buffercache/pg_buffercache_pages.c' cleanly.
Applied patch to 'contrib/pg_logicalinspect/pg_logicalinspect.c' cleanly.
Applied patch to 'contrib/pg_prewarm/autoprewarm.c' cleanly.
Applied patch to 'contrib/pg_stat_statements/pg_stat_statements.c' cleanly.
Applied patch to 'contrib/pg_trgm/trgm_gin.c' cleanly.
Applied patch to 'contrib/pg_trgm/trgm_gist.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_visibility/pg_visibility.c' cleanly.
Applied patch to 'contrib/pg_walinspect/pg_walinspect.c' cleanly.
Applied patch to 'contrib/pgcrypto/mbuf.c' cleanly.
Applied patch to 'contrib/pgcrypto/openssl.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-cfb.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-compress.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-decrypt.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-encrypt.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-pgsql.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp-pubkey.c' cleanly.
Applied patch to 'contrib/pgcrypto/pgp.c' cleanly.
Applied patch to 'contrib/pgcrypto/px-hmac.c' cleanly.
Applied patch to 'contrib/pgcrypto/px.c' cleanly.
Applied patch to 'contrib/pgrowlocks/pgrowlocks.c' cleanly.
Applied patch to 'contrib/postgres_fdw/postgres_fdw.c' cleanly.
Applied patch to 'contrib/seg/seg.c' cleanly.
Applied patch to 'contrib/sepgsql/label.c' cleanly.
Applied patch to 'contrib/sepgsql/uavc.c' cleanly.
Applied patch to 'contrib/spi/autoinc.c' cleanly.
Applied patch to 'contrib/spi/refint.c' cleanly.
Applied patch to 'contrib/sslinfo/sslinfo.c' cleanly.
Applied patch to 'contrib/tablefunc/tablefunc.c' cleanly.
Applied patch to 'contrib/test_decoding/test_decoding.c' cleanly.
Applied patch to 'contrib/unaccent/unaccent.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_minmax_multi.c' cleanly.
Applied patch to 'src/backend/access/brin/brin_revmap.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/heaptuple.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/common/tidstore.c' cleanly.
Applied patch to 'src/backend/access/common/tupconvert.c' cleanly.
Applied patch to 'src/backend/access/common/tupdesc.c' cleanly.
Applied patch to 'src/backend/access/gin/ginbtree.c' cleanly.
Applied patch to 'src/backend/access/gin/gindatapage.c' cleanly.
Applied patch to 'src/backend/access/gin/ginentrypage.c' cleanly.
Applied patch to 'src/backend/access/gin/ginget.c' cleanly.
Applied patch to 'src/backend/access/gin/gininsert.c' cleanly.
Applied patch to 'src/backend/access/gin/ginscan.c' cleanly.
Applied patch to 'src/backend/access/gin/ginutil.c' cleanly.
Applied patch to 'src/backend/access/gin/ginvacuum.c' cleanly.
Applied patch to 'src/backend/access/gist/gist.c' cleanly.
Applied patch to 'src/backend/access/gist/gistbuild.c' cleanly.
Applied patch to 'src/backend/access/gist/gistbuildbuffers.c' cleanly.
Applied patch to 'src/backend/access/gist/gistproc.c' cleanly.
Applied patch to 'src/backend/access/gist/gistscan.c' cleanly.
Applied patch to 'src/backend/access/gist/gistsplit.c' cleanly.
Applied patch to 'src/backend/access/gist/gistutil.c' cleanly.
Applied patch to 'src/backend/access/gist/gistvacuum.c' cleanly.
Applied patch to 'src/backend/access/gist/gistxlog.c' cleanly.
Applied patch to 'src/backend/access/hash/hash.c' cleanly.
Applied patch to 'src/backend/access/hash/hashsort.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly.
Applied patch to 'src/backend/access/heap/vacuumlazy.c' with conflicts.
Applied patch to 'src/backend/access/index/amvalidate.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtinsert.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtree.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtsort.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgdoinsert.c' cleanly.
Applied patch to 'src/backend/access/spgist/spginsert.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/spgtextproc.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgutils.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgvacuum.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgxlog.c' cleanly.
Applied patch to 'src/backend/access/transam/multixact.c' cleanly.
Applied patch to 'src/backend/access/transam/parallel.c' cleanly.
Applied patch to 'src/backend/access/transam/timeline.c' cleanly.
Applied patch to 'src/backend/access/transam/twophase.c' cleanly.
Applied patch to 'src/backend/access/transam/xact.c' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogfuncs.c' cleanly.
Applied patch to 'src/backend/access/transam/xloginsert.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogprefetcher.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogutils.c' cleanly.
Applied patch to 'src/backend/backup/basebackup.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_copy.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_gzip.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_incremental.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_lz4.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_progress.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_server.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_target.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_throttle.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_zstd.c' cleanly.
Applied patch to 'src/backend/backup/walsummary.c' cleanly.
Applied patch to 'src/backend/bootstrap/bootstrap.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/index.c' cleanly.
Applied patch to 'src/backend/catalog/namespace.c' cleanly.
Applied patch to 'src/backend/catalog/objectaddress.c' cleanly.
Applied patch to 'src/backend/catalog/pg_constraint.c' cleanly.
Applied patch to 'src/backend/catalog/pg_depend.c' cleanly.
Applied patch to 'src/backend/catalog/pg_enum.c' cleanly.
Applied patch to 'src/backend/catalog/pg_inherits.c' cleanly.
Applied patch to 'src/backend/catalog/pg_publication.c' cleanly.
Applied patch to 'src/backend/catalog/pg_shdepend.c' cleanly.
Applied patch to 'src/backend/catalog/pg_subscription.c' cleanly.
Applied patch to 'src/backend/catalog/storage.c' cleanly.
Applied patch to 'src/backend/commands/alter.c' cleanly.
Applied patch to 'src/backend/commands/analyze.c' cleanly.
Applied patch to 'src/backend/commands/async.c' cleanly.
Applied patch to 'src/backend/commands/cluster.c' cleanly.
Applied patch to 'src/backend/commands/collationcmds.c' cleanly.
Applied patch to 'src/backend/commands/copy.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/dbcommands.c' cleanly.
Applied patch to 'src/backend/commands/event_trigger.c' cleanly.
Applied patch to 'src/backend/commands/explain.c' cleanly.
Applied patch to 'src/backend/commands/extension.c' cleanly.
Applied patch to 'src/backend/commands/functioncmds.c' cleanly.
Applied patch to 'src/backend/commands/matview.c' cleanly.
Applied patch to 'src/backend/commands/opclasscmds.c' cleanly.
Applied patch to 'src/backend/commands/policy.c' cleanly.
Applied patch to 'src/backend/commands/publicationcmds.c' cleanly.
Applied patch to 'src/backend/commands/seclabel.c' cleanly.
Applied patch to 'src/backend/commands/subscriptioncmds.c' cleanly.
Applied patch to 'src/backend/commands/tablecmds.c' with conflicts.
Applied patch to 'src/backend/commands/tablespace.c' cleanly.
Applied patch to 'src/backend/commands/trigger.c' with conflicts.
Applied patch to 'src/backend/commands/tsearchcmds.c' cleanly.
Applied patch to 'src/backend/commands/typecmds.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/executor/execExpr.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/execIndexing.c' cleanly.
Applied patch to 'src/backend/executor/execJunk.c' cleanly.
Applied patch to 'src/backend/executor/execMain.c' cleanly.
Applied patch to 'src/backend/executor/execParallel.c' cleanly.
Applied patch to 'src/backend/executor/execPartition.c' with conflicts.
Applied patch to 'src/backend/executor/execReplication.c' cleanly.
Applied patch to 'src/backend/executor/execSRF.c' cleanly.
Applied patch to 'src/backend/executor/execTuples.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/nodeAppend.c' cleanly.
Applied patch to 'src/backend/executor/nodeBitmapAnd.c' cleanly.
Applied patch to 'src/backend/executor/nodeBitmapOr.c' cleanly.
Applied patch to 'src/backend/executor/nodeIndexscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeMemoize.c' cleanly.
Applied patch to 'src/backend/executor/nodeMergeAppend.c' cleanly.
Applied patch to 'src/backend/executor/nodeModifyTable.c' cleanly.
Applied patch to 'src/backend/executor/nodeSamplescan.c' cleanly.
Applied patch to 'src/backend/executor/nodeSubplan.c' cleanly.
Applied patch to 'src/backend/executor/nodeTidrangescan.c' cleanly.
Applied patch to 'src/backend/executor/nodeTidscan.c' cleanly.
Applied patch to 'src/backend/executor/spi.c' cleanly.
Applied patch to 'src/backend/executor/tqueue.c' cleanly.
Applied patch to 'src/backend/executor/tstoreReceiver.c' cleanly.
Applied patch to 'src/backend/foreign/foreign.c' cleanly.
Applied patch to 'src/backend/jit/llvm/llvmjit.c' cleanly.
Applied patch to 'src/backend/jit/llvm/llvmjit_deform.c' cleanly.
Applied patch to 'src/backend/jit/llvm/llvmjit_expr.c' cleanly.
Applied patch to 'src/backend/lib/bipartite_match.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/knapsack.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/hba.c' cleanly.
Applied patch to 'src/backend/libpq/pqcomm.c' cleanly.
Applied patch to 'src/backend/nodes/queryjumblefuncs.c' cleanly.
Applied patch to 'src/backend/nodes/readfuncs.c' cleanly.
Applied patch to 'src/backend/optimizer/geqo/geqo_erx.c' cleanly.
Applied patch to 'src/backend/optimizer/geqo/geqo_eval.c' cleanly.
Applied patch to 'src/backend/optimizer/geqo/geqo_pmx.c' cleanly.
Applied patch to 'src/backend/optimizer/geqo/geqo_pool.c' cleanly.
Applied patch to 'src/backend/optimizer/geqo/geqo_recombination.c' cleanly.
Applied patch to 'src/backend/optimizer/path/allpaths.c' cleanly.
Applied patch to 'src/backend/optimizer/path/clausesel.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/pathkeys.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/setrefs.c' cleanly.
Applied patch to 'src/backend/optimizer/prep/prepjointree.c' cleanly.
Applied patch to 'src/backend/optimizer/prep/prepunion.c' cleanly.
Applied patch to 'src/backend/optimizer/util/appendinfo.c' cleanly.
Applied patch to 'src/backend/optimizer/util/clauses.c' cleanly.
Applied patch to 'src/backend/optimizer/util/plancat.c' cleanly.
Applied patch to 'src/backend/optimizer/util/predtest.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_clause.c' cleanly.
Applied patch to 'src/backend/parser/parse_expr.c' cleanly.
Applied patch to 'src/backend/parser/parse_node.c' cleanly.
Applied patch to 'src/backend/parser/parse_param.c' cleanly.
Applied patch to 'src/backend/parser/parse_relation.c' cleanly.
Applied patch to 'src/backend/parser/parse_type.c' cleanly.
Applied patch to 'src/backend/partitioning/partbounds.c' cleanly.
Applied patch to 'src/backend/partitioning/partdesc.c' cleanly.
Applied patch to 'src/backend/partitioning/partprune.c' with conflicts.
Applied patch to 'src/backend/postmaster/autovacuum.c' cleanly.
Applied patch to 'src/backend/postmaster/checkpointer.c' cleanly.
Applied patch to 'src/backend/postmaster/pgarch.c' cleanly.
Applied patch to 'src/backend/postmaster/pmchild.c' cleanly.
Applied patch to 'src/backend/postmaster/postmaster.c' cleanly.
Applied patch to 'src/backend/postmaster/syslogger.c' cleanly.
Applied patch to 'src/backend/postmaster/walsummarizer.c' cleanly.
Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly.
Applied patch to 'src/backend/replication/logical/applyparallelworker.c' cleanly.
Applied patch to 'src/backend/replication/logical/launcher.c' cleanly.
Applied patch to 'src/backend/replication/logical/logical.c' cleanly.
Applied patch to 'src/backend/replication/logical/logicalfuncs.c' cleanly.
Applied patch to 'src/backend/replication/logical/proto.c' cleanly.
Applied patch to 'src/backend/replication/logical/reorderbuffer.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/syncrep.c' cleanly.
Applied patch to 'src/backend/replication/walreceiver.c' cleanly.
Applied patch to 'src/backend/replication/walsender.c' cleanly.
Applied patch to 'src/backend/rewrite/rewriteHandler.c' cleanly.
Applied patch to 'src/backend/rewrite/rewriteManip.c' cleanly.
Applied patch to 'src/backend/snowball/dict_snowball.c' cleanly.
Applied patch to 'src/backend/statistics/dependencies.c' cleanly.
Applied patch to 'src/backend/statistics/extended_stats.c' cleanly.
Applied patch to 'src/backend/statistics/mcv.c' cleanly.
Applied patch to 'src/backend/statistics/mvdistinct.c' cleanly.
Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly.
Applied patch to 'src/backend/storage/file/buffile.c' cleanly.
Applied patch to 'src/backend/storage/file/fd.c' cleanly.
Applied patch to 'src/backend/storage/ipc/procarray.c' cleanly.
Applied patch to 'src/backend/storage/ipc/shm_mq.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/deadlock.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/storage/lmgr/predicate.c' cleanly.
Applied patch to 'src/backend/storage/smgr/bulk_write.c' cleanly.
Applied patch to 'src/backend/storage/smgr/md.c' cleanly.
Applied patch to 'src/backend/storage/smgr/smgr.c' cleanly.
Applied patch to 'src/backend/storage/sync/sync.c' cleanly.
Applied patch to 'src/backend/tcop/fastpath.c' cleanly.
Applied patch to 'src/backend/tcop/pquery.c' cleanly.
Applied patch to 'src/backend/tsearch/dict.c' cleanly.
Applied patch to 'src/backend/tsearch/dict_ispell.c' cleanly.
Applied patch to 'src/backend/tsearch/dict_simple.c' cleanly.
Applied patch to 'src/backend/tsearch/dict_synonym.c' cleanly.
Applied patch to 'src/backend/tsearch/dict_thesaurus.c' cleanly.
Applied patch to 'src/backend/tsearch/spell.c' cleanly.
Applied patch to 'src/backend/tsearch/ts_parse.c' cleanly.
Applied patch to 'src/backend/tsearch/ts_selfuncs.c' cleanly.
Applied patch to 'src/backend/tsearch/ts_typanalyze.c' cleanly.
Applied patch to 'src/backend/tsearch/ts_utils.c' cleanly.
Applied patch to 'src/backend/tsearch/wparser.c' cleanly.
Applied patch to 'src/backend/tsearch/wparser_def.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_relation.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event.c' cleanly.
Applied patch to 'src/backend/utils/adt/acl.c' cleanly.
Applied patch to 'src/backend/utils/adt/array_selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/array_typanalyze.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/arraysubs.c' cleanly.
Applied patch to 'src/backend/utils/adt/arrayutils.c' cleanly.
Applied patch to 'src/backend/utils/adt/date.c' cleanly.
Applied patch to 'src/backend/utils/adt/datetime.c' cleanly.
Applied patch to 'src/backend/utils/adt/enum.c' cleanly.
Applied patch to 'src/backend/utils/adt/formatting.c' cleanly.
Applied patch to 'src/backend/utils/adt/geo_ops.c' cleanly.
Applied patch to 'src/backend/utils/adt/geo_spgist.c' cleanly.
Applied patch to 'src/backend/utils/adt/int.c' cleanly.
Applied patch to 'src/backend/utils/adt/int8.c' cleanly.
Applied patch to 'src/backend/utils/adt/json.c' cleanly.
Applied patch to 'src/backend/utils/adt/jsonb.c' cleanly.
Applied patch to 'src/backend/utils/adt/jsonb_gin.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/levenshtein.c' cleanly.
Applied patch to 'src/backend/utils/adt/lockfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/mac.c' cleanly.
Applied patch to 'src/backend/utils/adt/mac8.c' cleanly.
Applied patch to 'src/backend/utils/adt/mcxtfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/misc.c' cleanly.
Applied patch to 'src/backend/utils/adt/multirangetypes.c' cleanly.
Applied patch to 'src/backend/utils/adt/multirangetypes_selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/name.c' cleanly.
Applied patch to 'src/backend/utils/adt/network.c' cleanly.
Applied patch to 'src/backend/utils/adt/network_gist.c' cleanly.
Applied patch to 'src/backend/utils/adt/numeric.c' cleanly.
Applied patch to 'src/backend/utils/adt/oracle_compat.c' cleanly.
Applied patch to 'src/backend/utils/adt/orderedsetaggs.c' cleanly.
Applied patch to 'src/backend/utils/adt/pg_locale_libc.c' cleanly.
Applied patch to 'src/backend/utils/adt/rangetypes_gist.c' cleanly.
Applied patch to 'src/backend/utils/adt/rangetypes_selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/rangetypes_spgist.c' cleanly.
Applied patch to 'src/backend/utils/adt/rangetypes_typanalyze.c' cleanly.
Applied patch to 'src/backend/utils/adt/regexp.c' cleanly.
Applied patch to 'src/backend/utils/adt/rowtypes.c' cleanly.
Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly.
Applied patch to 'src/backend/utils/adt/selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/timestamp.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsginidx.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsgistidx.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsquery.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsquery_cleanup.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsquery_gist.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsquery_op.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsquery_rewrite.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsquery_util.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsrank.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsvector.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsvector_op.c' cleanly.
Applied patch to 'src/backend/utils/adt/tsvector_parser.c' cleanly.
Applied patch to 'src/backend/utils/adt/uuid.c' cleanly.
Applied patch to 'src/backend/utils/adt/varlena.c' cleanly.
Applied patch to 'src/backend/utils/adt/xml.c' cleanly.
Applied patch to 'src/backend/utils/cache/catcache.c' cleanly.
Applied patch to 'src/backend/utils/cache/evtcache.c' cleanly.
Applied patch to 'src/backend/utils/cache/inval.c' cleanly.
Applied patch to 'src/backend/utils/cache/lsyscache.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/cache/typcache.c' cleanly.
Applied patch to 'src/backend/utils/error/elog.c' cleanly.
Applied patch to 'src/backend/utils/fmgr/fmgr.c' cleanly.
Applied patch to 'src/backend/utils/fmgr/funcapi.c' cleanly.
Applied patch to 'src/backend/utils/init/postinit.c' cleanly.
Applied patch to 'src/backend/utils/mb/mbutils.c' cleanly.
Applied patch to 'src/backend/utils/misc/conffiles.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc.c' cleanly.
Applied patch to 'src/backend/utils/misc/tzparser.c' cleanly.
Applied patch to 'src/backend/utils/mmgr/dsa.c' cleanly.
Applied patch to 'src/backend/utils/sort/logtape.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/backend/utils/sort/tuplesortvariants.c' cleanly.
Applied patch to 'src/backend/utils/sort/tuplestore.c' cleanly.
Applied patch to 'src/backend/utils/time/combocid.c' cleanly.
Applied patch to 'src/backend/utils/time/snapmgr.c' cleanly.
Applied patch to 'src/bin/pg_basebackup/astreamer_inject.c' cleanly.
Applied patch to 'src/bin/pg_combinebackup/load_manifest.c' cleanly.
Applied patch to 'src/bin/pg_dump/common.c' cleanly.
Applied patch to 'src/bin/pg_verifybackup/astreamer_verify.c' cleanly.
Applied patch to 'src/bin/pg_verifybackup/pg_verifybackup.c' cleanly.
Applied patch to 'src/common/blkreftable.c' cleanly.
Applied patch to 'src/common/parse_manifest.c' cleanly.
Applied patch to 'src/common/pgfnames.c' cleanly.
Applied patch to 'src/common/rmtree.c' cleanly.
Applied patch to 'src/fe_utils/astreamer_file.c' cleanly.
Applied patch to 'src/fe_utils/astreamer_gzip.c' cleanly.
Applied patch to 'src/fe_utils/astreamer_lz4.c' cleanly.
Applied patch to 'src/fe_utils/astreamer_tar.c' cleanly.
Applied patch to 'src/fe_utils/astreamer_zstd.c' cleanly.
Applied patch to 'src/pl/plperl/plperl.c' cleanly.
Applied patch to 'src/pl/plpgsql/src/pl_comp.c' cleanly.
Applied patch to 'src/pl/plpgsql/src/pl_exec.c' cleanly.
Applied patch to 'src/pl/plpython/plpy_cursorobject.c' cleanly.
Applied patch to 'src/pl/plpython/plpy_exec.c' cleanly.
Applied patch to 'src/pl/plpython/plpy_procedure.c' cleanly.
Applied patch to 'src/pl/plpython/plpy_spi.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/dummy_index_am/dummy_index_am.c' cleanly.
Applied patch to 'src/test/modules/plsample/plsample.c' cleanly.
Applied patch to 'src/test/modules/test_integerset/test_integerset.c' cleanly.
Applied patch to 'src/test/modules/test_parser/test_parser.c' cleanly.
Applied patch to 'src/test/modules/test_radixtree/test_radixtree.c' cleanly.
Applied patch to 'src/test/modules/test_rbtree/test_rbtree.c' cleanly.
Applied patch to 'src/test/modules/test_regex/test_regex.c' cleanly.
Applied patch to 'src/test/modules/test_resowner/test_resowner_basic.c' cleanly.
Applied patch to 'src/test/modules/test_resowner/test_resowner_many.c' cleanly.
Applied patch to 'src/test/modules/test_rls_hooks/test_rls_hooks.c' cleanly.
Applied patch to 'src/test/modules/worker_spi/worker_spi.c' cleanly.
Applied patch to 'src/test/regress/regress.c' cleanly.
Applied patch to 'src/timezone/pgtz.c' cleanly.
Applied patch to 'src/tutorial/complex.c' cleanly.
Applied patch to 'src/tutorial/funcs.c' cleanly.
U src/backend/access/heap/vacuumlazy.c
U src/backend/commands/tablecmds.c
U src/backend/commands/trigger.c
U src/backend/executor/execPartition.c
U src/backend/partitioning/partprune.c
warning: squelched 46 whitespace errors
warning: 51 lines add whitespace errors.
diff --cc src/backend/access/heap/vacuumlazy.c
index 1af18a78a2,87b734fbfe..0000000000
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@@ -3505,8 -3033,8 +3505,13 @@@ dead_items_alloc(LVRelState *vacrel, in
  	 * locally.
  	 */
  
++<<<<<<< ours
 +	dead_items_info = (VacDeadItemsInfo *) palloc(sizeof(VacDeadItemsInfo));
 +	dead_items_info->max_bytes = vac_work_mem * (Size) 1024;
++=======
+ 	dead_items_info = palloc_object(VacDeadItemsInfo);
+ 	dead_items_info->max_bytes = vac_work_mem * 1024L;
++>>>>>>> theirs
  	dead_items_info->num_items = 0;
  	vacrel->dead_items_info = dead_items_info;
  
diff --cc src/backend/commands/tablecmds.c
index 9d8754be7e,187daeaedc..0000000000
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -8555,19 -8490,16 +8554,26 @@@ ATExecSetExpression(AlteredTableInfo *t
  	/* Make above new expression visible */
  	CommandCounterIncrement();
  
 -	/* Prepare for table rewrite */
 -	defval = (Expr *) build_column_default(rel, attnum);
 +	if (rewrite)
 +	{
 +		/* Prepare for table rewrite */
 +		defval = (Expr *) build_column_default(rel, attnum);
  
++<<<<<<< ours
 +		newval = (NewColumnValue *) palloc0(sizeof(NewColumnValue));
 +		newval->attnum = attnum;
 +		newval->expr = expression_planner(defval);
 +		newval->is_generated = true;
++=======
+ 	newval = palloc0_object(NewColumnValue);
+ 	newval->attnum = attnum;
+ 	newval->expr = expression_planner(defval);
+ 	newval->is_generated = true;
++>>>>>>> theirs
  
 -	tab->newvals = lappend(tab->newvals, newval);
 -	tab->rewrite |= AT_REWRITE_DEFAULT_VAL;
 +		tab->newvals = lappend(tab->newvals, newval);
 +		tab->rewrite |= AT_REWRITE_DEFAULT_VAL;
 +	}
  
  	/* Drop any pg_statistic entry for the column */
  	RemoveStatistics(RelationGetRelid(rel), attnum);
diff --cc src/backend/commands/trigger.c
index 67f8e70f9c,a18bb17991..0000000000
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@@ -4999,11 -4971,11 +4999,19 @@@ MakeTransitionCaptureState(TriggerDesc 
  	MemoryContextSwitchTo(oldcxt);
  
  	/* Now build the TransitionCaptureState struct, in caller's context */
++<<<<<<< ours
 +	state = (TransitionCaptureState *) palloc0(sizeof(TransitionCaptureState));
 +	state->tcs_delete_old_table = need_old_del;
 +	state->tcs_update_old_table = need_old_upd;
 +	state->tcs_update_new_table = need_new_upd;
 +	state->tcs_insert_new_table = need_new_ins;
++=======
+ 	state = palloc0_object(TransitionCaptureState);
+ 	state->tcs_delete_old_table = trigdesc->trig_delete_old_table;
+ 	state->tcs_update_old_table = trigdesc->trig_update_old_table;
+ 	state->tcs_update_new_table = trigdesc->trig_update_new_table;
+ 	state->tcs_insert_new_table = trigdesc->trig_insert_new_table;
++>>>>>>> theirs
  	state->tcs_private = table;
  
  	return state;
diff --cc src/backend/executor/execPartition.c
index b6e89d0620,046933bfc4..0000000000
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@@ -2340,33 -2195,19 +2340,40 @@@ InitExecPartitionPruneContexts(Partitio
  	Bitmapset  *new_other_subplans;
  	int			i;
  	int			newidx;
 +	bool		fix_subplan_map = false;
 +
 +	Assert(prunestate->do_exec_prune);
 +	Assert(parent_plan != NULL);
 +	estate = parent_plan->state;
  
  	/*
 -	 * First we must build a temporary array which maps old subplan indexes to
 -	 * new ones.  For convenience of initialization, we use 1-based indexes in
 -	 * this array and leave pruned items as 0.
 +	 * No need to fix subplans maps if initial pruning didn't eliminate any
 +	 * subplans.
  	 */
++<<<<<<< ours
 +	if (bms_num_members(initially_valid_subplans) < n_total_subplans)
++=======
+ 	new_subplan_indexes = palloc0_array(int, n_total_subplans);
+ 	newidx = 1;
+ 	i = -1;
+ 	while ((i = bms_next_member(initially_valid_subplans, i)) >= 0)
++>>>>>>> theirs
  	{
 -		Assert(i < n_total_subplans);
 -		new_subplan_indexes[i] = newidx++;
 +		fix_subplan_map = true;
 +
 +		/*
 +		 * First we must build a temporary array which maps old subplan
 +		 * indexes to new ones.  For convenience of initialization, we use
 +		 * 1-based indexes in this array and leave pruned items as 0.
 +		 */
 +		new_subplan_indexes = (int *) palloc0(sizeof(int) * n_total_subplans);
 +		newidx = 1;
 +		i = -1;
 +		while ((i = bms_next_member(initially_valid_subplans, i)) >= 0)
 +		{
 +			Assert(i < n_total_subplans);
 +			new_subplan_indexes[i] = newidx++;
 +		}
  	}
  
  	/*
diff --cc src/backend/partitioning/partprune.c
index ff926732f3,d57200946a..0000000000
--- a/src/backend/partitioning/partprune.c
+++ b/src/backend/partitioning/partprune.c
@@@ -653,12 -645,11 +653,16 @@@ make_partitionedrel_pruneinfo(PlannerIn
  		 * Also construct a Bitmapset of all partitions that are present (that
  		 * is, not pruned already).
  		 */
- 		subplan_map = (int *) palloc(nparts * sizeof(int));
+ 		subplan_map = palloc_array(int, nparts);
  		memset(subplan_map, -1, nparts * sizeof(int));
- 		subpart_map = (int *) palloc(nparts * sizeof(int));
+ 		subpart_map = palloc_array(int, nparts);
  		memset(subpart_map, -1, nparts * sizeof(int));
++<<<<<<< ours
 +		relid_map = (Oid *) palloc0(nparts * sizeof(Oid));
 +		leafpart_rti_map = (int *) palloc0(nparts * sizeof(int));
++=======
+ 		relid_map = palloc0_array(Oid, nparts);
++>>>>>>> theirs
  		present_parts = NULL;
  
  		i = -1;