[PATCH] pg_stat_activity: make slow/hanging authentication more visible

Applying: Report external auth calls as wait events
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
M	src/backend/libpq/auth.c
M	src/backend/utils/activity/wait_event.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/include/utils/wait_event.h
M	src/test/regress/expected/sysviews.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/sysviews.out
CONFLICT (content): Merge conflict in src/test/regress/expected/sysviews.out
Auto-merging src/include/utils/wait_event.h
CONFLICT (content): Merge conflict in src/include/utils/wait_event.h
Auto-merging src/backend/utils/activity/wait_event_names.txt
Auto-merging src/backend/utils/activity/wait_event.c
Auto-merging src/backend/libpq/auth.c
CONFLICT (content): Merge conflict in src/backend/libpq/auth.c
Auto-merging doc/src/sgml/monitoring.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/monitoring.sgml
Patch failed at 0001 Report external auth calls as wait events

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"