PATCH: two slab-like memory allocators

Applying: Generational memory allocator
Using index info to reconstruct a base tree...
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/utils/mmgr/Makefile
M	src/backend/utils/mmgr/README
M	src/include/nodes/memnodes.h
M	src/include/nodes/nodes.h
M	src/include/replication/reorderbuffer.h
M	src/include/utils/memutils.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/memutils.h
Auto-merging src/include/replication/reorderbuffer.h
CONFLICT (content): Merge conflict in src/include/replication/reorderbuffer.h
Auto-merging src/include/nodes/nodes.h
CONFLICT (content): Merge conflict in src/include/nodes/nodes.h
Auto-merging src/include/nodes/memnodes.h
CONFLICT (content): Merge conflict in src/include/nodes/memnodes.h
CONFLICT (add/add): Merge conflict in src/backend/utils/mmgr/generation.c
Auto-merging src/backend/utils/mmgr/generation.c
Auto-merging src/backend/utils/mmgr/README
CONFLICT (content): Merge conflict in src/backend/utils/mmgr/README
Auto-merging src/backend/utils/mmgr/Makefile
CONFLICT (content): Merge conflict in src/backend/utils/mmgr/Makefile
Auto-merging src/backend/replication/logical/reorderbuffer.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/reorderbuffer.c
Patch failed at 0001 Generational memory allocator

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"