From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 9 Dec 2021 07:43:50 +0000 (-0800)
Subject: Merge tag 'v5.15' into next
X-Git-Tag: v5.17-rc1~60^2^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d8dfaa71d87f742c53309b95cb6a8b274119027;p=thirdparty%2Flinux.git

Merge tag 'v5.15' into next

Sync up with the mainline to get the latest APIs and DT bindings.
---

5d8dfaa71d87f742c53309b95cb6a8b274119027
diff --cc MAINTAINERS
index 5122b3a3bf568,3b79fd441dde8..27820183b4847
--- a/MAINTAINERS
+++ b/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