Merge tag 'v5.15' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 9 Dec 2021 07:43:50 +0000 (23:43 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 9 Dec 2021 07:43:50 +0000 (23:43 -0800)
Sync up with the mainline to get the latest APIs and DT bindings.

1  2 
MAINTAINERS
drivers/input/joystick/analog.c
drivers/input/keyboard/Kconfig
drivers/input/touchscreen/elants_i2c.c
drivers/input/touchscreen/goodix.c
kernel/reboot.c

diff --cc MAINTAINERS
@@@ -7716,15 -7947,14 +7954,15 @@@ F:   drivers/media/usb/go7007
  
  GOODIX TOUCHSCREEN
  M:    Bastien Nocera <hadess@hadess.net>
 +M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
 -F:    drivers/input/touchscreen/goodix.c
 +F:    drivers/input/touchscreen/goodix*
  
  GOOGLE ETHERNET DRIVERS
- M:    Catherine Sullivan <csully@google.com>
- R:    Sagi Shahar <sagis@google.com>
- R:    Jon Olson <jonolson@google.com>
+ M:    Jeroen de Borst <jeroendb@google.com>
+ R:    Catherine Sullivan <csully@google.com>
+ R:    David Awogbemila <awogbemila@google.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/google/gve.rst
Simple merge
Simple merge
Simple merge
diff --cc kernel/reboot.c
Simple merge