Merge tag 'v4.15' into next

Sync with mainline to get in trackpoint updates and other changes.

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/Kconfig
Simple merge

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