pgstat: allow a stats kind to use its own dedicated dsa/dshash

Applying: pgstat: allow a stats kind to use its own dedicated dshash
Using index info to reconstruct a base tree...
M	src/backend/utils/activity/pgstat.c
M	src/backend/utils/activity/pgstat_shmem.c
M	src/include/utils/pgstat_internal.h
M	src/test/modules/test_custom_stats/test_custom_var_stats.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_custom_stats/test_custom_var_stats.c
Auto-merging src/include/utils/pgstat_internal.h
Auto-merging src/backend/utils/activity/pgstat_shmem.c
CONFLICT (content): Merge conflict in src/backend/utils/activity/pgstat_shmem.c
Auto-merging src/backend/utils/activity/pgstat.c
Patch failed at 0001 pgstat: allow a stats kind to use its own dedicated dshash

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"