Throwing away unnecessary spin-locks

Applying: replace slock_{read,write}_*
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/commands/repack.c
M	src/backend/executor/nodeBitmapHeapscan.c
M	src/backend/replication/logical/worker.c
M	src/backend/replication/slot.c
M	src/backend/storage/ipc/sinvaladt.c
M	src/backend/utils/sort/tuplesort.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/sort/tuplesort.c
CONFLICT (content): Merge conflict in src/backend/utils/sort/tuplesort.c
Auto-merging src/backend/storage/ipc/sinvaladt.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/sinvaladt.c
Auto-merging src/backend/replication/slot.c
Auto-merging src/backend/replication/logical/worker.c
Auto-merging src/backend/executor/nodeBitmapHeapscan.c
CONFLICT (content): Merge conflict in src/backend/executor/nodeBitmapHeapscan.c
Auto-merging src/backend/commands/repack.c
Auto-merging src/backend/access/transam/xlogrecovery.c
Patch failed at 0001 replace slock_{read,write}_*

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"