Merge branch 'next' into for-linus

Prepare input updates for 6.11 merge window.

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

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

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