Merge tag 'v4.17-rc6' into next

Sync up with mainline to bring in Atmel controller changes for Caroline.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/joystick/xpad.c
Simple merge

diff --cc drivers/input/mouse/alps.c
Simple merge

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