Merge branch 'next' into for-linus

Prepare input updates for 7.1 merge window.

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

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

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