Merge branch 'next' into for-linus

Prepare input updates for 6.17 merge window.

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

diff --cc drivers/input/keyboard/atkbd.c
Simple merge

diff --cc drivers/input/misc/cs40l50-vibra.c
Simple merge

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