Merge tag 'v4.20' into for-linus

Sync with mainline to get linux/overflow.h among other things.

diff --cc drivers/clk/mmp/clk-of-mmp2.c
Simple merge

diff --cc drivers/input/misc/rotary_encoder.c
Simple merge

diff --cc drivers/input/serio/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc include/uapi/linux/input.h
Simple merge