Merge branch 'next' into for-linus

Prepare input updates for 4.16 merge window.

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

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

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

diff --cc drivers/input/rmi4/rmi_driver.c
Simple merge

diff --cc drivers/input/touchscreen/elants_i2c.c
Simple merge