=== Applying patches on top of PostgreSQL commit ID 1572ea96e65731eee3227fbc3c119bd9f39e8e50 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jan 21 11:51:24 UTC 2026 On branch cf/6419 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Convert-wait_event_info-to-64-bits-expose-lower-3.patch === Applying: Convert wait_event_info to 64-bits, expose lower 32-bit as new wait_event_arg Using index info to reconstruct a base tree... M src/backend/access/transam/xlogwait.c M src/backend/storage/lmgr/lwlock.c M src/backend/storage/lmgr/proc.c M src/backend/storage/smgr/md.c M src/include/catalog/pg_proc.dat M src/include/storage/lwlock.h M src/include/storage/proc.h M src/test/modules/injection_points/injection_points.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/injection_points/injection_points.c CONFLICT (content): Merge conflict in src/test/modules/injection_points/injection_points.c Auto-merging src/include/storage/proc.h Auto-merging src/include/storage/lwlock.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/storage/smgr/md.c Auto-merging src/backend/storage/lmgr/proc.c Auto-merging src/backend/storage/lmgr/lwlock.c Auto-merging src/backend/access/transam/xlogwait.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 Convert wait_event_info to 64-bits, expose lower 32-bit as new wait_event_arg 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/dblink/dblink.c M contrib/postgres_fdw/connection.c M src/backend/access/transam/xlogarchive.c M src/backend/access/transam/xlogwait.c M src/backend/catalog/system_views.sql M src/backend/replication/syncrep.c M src/backend/replication/walsender.c M src/backend/storage/aio/aio_io.c M src/backend/storage/file/fd.c M src/backend/storage/ipc/barrier.c M src/backend/storage/ipc/latch.c M src/backend/storage/ipc/standby.c M src/backend/storage/ipc/waiteventset.c M src/backend/storage/lmgr/condition_variable.c M src/backend/storage/lmgr/lwlock.c M src/backend/storage/lmgr/proc.c M src/backend/storage/lmgr/s_lock.c M src/backend/storage/smgr/md.c M src/backend/utils/activity/backend_status.c M src/backend/utils/activity/generate-wait_event_types.pl M src/backend/utils/activity/wait_event.c M src/backend/utils/adt/misc.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/adt/waitfuncs.c M src/include/access/xlogarchive.h M src/include/catalog/pg_proc.dat M src/include/libpq/libpq-be-fe-helpers.h M src/include/storage/barrier.h M src/include/storage/condition_variable.h M src/include/storage/fd.h M src/include/storage/latch.h M src/include/storage/lwlock.h M src/include/storage/proc.h M src/include/storage/waiteventset.h M src/include/utils/wait_classes.h M src/include/utils/wait_event.h M src/test/modules/injection_points/injection_points.c M src/test/modules/test_shm_mq/setup.c M src/test/modules/worker_spi/worker_spi.c M src/test/regress/expected/rules.out === using patch(1) to apply patch ./v3-0001-Convert-wait_event_info-to-64-bits-expose-lower-3.patch === patching file contrib/dblink/dblink.c patching file contrib/postgres_fdw/connection.c patching file src/backend/access/transam/xlogarchive.c patching file src/backend/access/transam/xlogwait.c Hunk #1 succeeded at 71 (offset -1 lines). patching file src/backend/catalog/system_views.sql patching file src/backend/replication/syncrep.c patching file src/backend/replication/walsender.c patching file src/backend/storage/aio/aio_io.c patching file src/backend/storage/file/fd.c patching file src/backend/storage/ipc/barrier.c patching file src/backend/storage/ipc/latch.c patching file src/backend/storage/ipc/standby.c patching file src/backend/storage/ipc/waiteventset.c patching file src/backend/storage/lmgr/condition_variable.c patching file src/backend/storage/lmgr/lwlock.c patching file src/backend/storage/lmgr/proc.c Hunk #2 succeeded at 1456 (offset -4 lines). Hunk #3 succeeded at 1978 (offset -4 lines). patching file src/backend/storage/lmgr/s_lock.c patching file src/backend/storage/smgr/md.c Hunk #16 succeeded at 1299 (offset 3 lines). Hunk #17 succeeded at 1333 (offset 3 lines). Hunk #18 succeeded at 1359 (offset 3 lines). Hunk #19 succeeded at 1439 (offset 3 lines). Hunk #20 succeeded at 1471 (offset 3 lines). Hunk #21 succeeded at 1516 (offset 3 lines). Hunk #22 succeeded at 1532 (offset 3 lines). Hunk #23 succeeded at 1908 (offset 3 lines). Hunk #24 succeeded at 1933 (offset 3 lines). patching file src/backend/utils/activity/backend_status.c patching file src/backend/utils/activity/generate-wait_event_types.pl patching file src/backend/utils/activity/wait_event.c patching file src/backend/utils/adt/misc.c patching file src/backend/utils/adt/pgstatfuncs.c patching file src/backend/utils/adt/waitfuncs.c patching file src/include/access/xlogarchive.h patching file src/include/catalog/pg_proc.dat patching file src/include/libpq/libpq-be-fe-helpers.h patching file src/include/storage/barrier.h patching file src/include/storage/condition_variable.h patching file src/include/storage/fd.h patching file src/include/storage/latch.h patching file src/include/storage/lwlock.h Hunk #1 succeeded at 138 (offset -4 lines). patching file src/include/storage/proc.h Hunk #1 succeeded at 305 (offset 6 lines). Hunk #2 succeeded at 518 (offset 6 lines). patching file src/include/storage/waiteventset.h patching file src/include/utils/wait_classes.h patching file src/include/utils/wait_event.h patching file src/test/modules/injection_points/injection_points.c Hunk #1 FAILED at 267. 1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/injection_points.c.rej patching file src/test/modules/test_shm_mq/setup.c patching file src/test/modules/worker_spi/worker_spi.c patching file src/test/regress/expected/rules.out Unstaged changes after reset: M contrib/dblink/dblink.c M contrib/postgres_fdw/connection.c M src/backend/access/transam/xlogarchive.c M src/backend/access/transam/xlogwait.c M src/backend/catalog/system_views.sql M src/backend/replication/syncrep.c M src/backend/replication/walsender.c M src/backend/storage/aio/aio_io.c M src/backend/storage/file/fd.c M src/backend/storage/ipc/barrier.c M src/backend/storage/ipc/latch.c M src/backend/storage/ipc/standby.c M src/backend/storage/ipc/waiteventset.c M src/backend/storage/lmgr/condition_variable.c M src/backend/storage/lmgr/lwlock.c M src/backend/storage/lmgr/proc.c M src/backend/storage/lmgr/s_lock.c M src/backend/storage/smgr/md.c M src/backend/utils/activity/backend_status.c M src/backend/utils/activity/generate-wait_event_types.pl M src/backend/utils/activity/wait_event.c M src/backend/utils/adt/misc.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/adt/waitfuncs.c M src/include/access/xlogarchive.h M src/include/catalog/pg_proc.dat M src/include/libpq/libpq-be-fe-helpers.h M src/include/storage/barrier.h M src/include/storage/condition_variable.h M src/include/storage/fd.h M src/include/storage/latch.h M src/include/storage/lwlock.h M src/include/storage/proc.h M src/include/storage/waiteventset.h M src/include/utils/wait_classes.h M src/include/utils/wait_event.h M src/test/modules/test_shm_mq/setup.c M src/test/modules/worker_spi/worker_spi.c M src/test/regress/expected/rules.out Removing src/test/modules/injection_points/injection_points.c.rej === using 'git apply' to apply patch ./v3-0001-Convert-wait_event_info-to-64-bits-expose-lower-3.patch === Applied patch to 'contrib/dblink/dblink.c' cleanly. Applied patch to 'contrib/postgres_fdw/connection.c' cleanly. Applied patch to 'src/backend/access/transam/xlogarchive.c' cleanly. Applied patch to 'src/backend/access/transam/xlogwait.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/replication/syncrep.c' cleanly. Applied patch to 'src/backend/replication/walsender.c' cleanly. Applied patch to 'src/backend/storage/aio/aio_io.c' cleanly. Applied patch to 'src/backend/storage/file/fd.c' cleanly. Applied patch to 'src/backend/storage/ipc/barrier.c' cleanly. Applied patch to 'src/backend/storage/ipc/latch.c' cleanly. Applied patch to 'src/backend/storage/ipc/standby.c' cleanly. Applied patch to 'src/backend/storage/ipc/waiteventset.c' cleanly. Applied patch to 'src/backend/storage/lmgr/condition_variable.c' cleanly. Applied patch to 'src/backend/storage/lmgr/lwlock.c' cleanly. Applied patch to 'src/backend/storage/lmgr/proc.c' cleanly. Applied patch to 'src/backend/storage/lmgr/s_lock.c' cleanly. Applied patch to 'src/backend/storage/smgr/md.c' cleanly. Applied patch to 'src/backend/utils/activity/backend_status.c' cleanly. Applied patch to 'src/backend/utils/activity/generate-wait_event_types.pl' cleanly. Applied patch to 'src/backend/utils/activity/wait_event.c' cleanly. Applied patch to 'src/backend/utils/adt/misc.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/backend/utils/adt/waitfuncs.c' cleanly. Applied patch to 'src/include/access/xlogarchive.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/libpq/libpq-be-fe-helpers.h' cleanly. Applied patch to 'src/include/storage/barrier.h' cleanly. Applied patch to 'src/include/storage/condition_variable.h' cleanly. Applied patch to 'src/include/storage/fd.h' cleanly. Applied patch to 'src/include/storage/latch.h' cleanly. Applied patch to 'src/include/storage/lwlock.h' cleanly. Applied patch to 'src/include/storage/proc.h' cleanly. Applied patch to 'src/include/storage/waiteventset.h' cleanly. Applied patch to 'src/include/utils/wait_classes.h' cleanly. Applied patch to 'src/include/utils/wait_event.h' cleanly. Applied patch to 'src/test/modules/injection_points/injection_points.c' with conflicts. Applied patch to 'src/test/modules/test_shm_mq/setup.c' cleanly. Applied patch to 'src/test/modules/worker_spi/worker_spi.c' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. U src/test/modules/injection_points/injection_points.c diff --cc src/test/modules/injection_points/injection_points.c index 3de0491e0ec,97e17b0a9f9..00000000000 --- a/src/test/modules/injection_points/injection_points.c +++ b/src/test/modules/injection_points/injection_points.c @@@ -267,8 -267,8 +267,13 @@@ injection_wait(const char *name, const { uint32 old_wait_counts = 0; int index = -1; ++<<<<<<< ours + uint32 injection_wait_event = 0; + const InjectionPointCondition *condition = private_data; ++======= + uint64 injection_wait_event = 0; + InjectionPointCondition *condition = (InjectionPointCondition *) private_data; ++>>>>>>> theirs if (inj_state == NULL) injection_init_shmem();