Merge tag 'ib-mfd-gpio-input-pwm-v6.17' of git://git.kernel.org/pub/scm/linux/kernel...

Merge an immutable branch between MFD, GPIO, Input and PWM to resolve
conflicts for the merge window pull request.

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc include/uapi/linux/input-event-codes.h
Simple merge