spi: Merge up fixes

They are a dependency for applying some changes to the MAINTAINERS
file.

diff --cc MAINTAINERS
index 589a09d865f02526cb96eddcbbd11994dde8c6b2,c9763412a508994d6d953f0cb35c2efa0a79b7cf..71591ceb5a9d30556bd277bc3780e5f47bc910be
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9820,13 -9828,7 +9828,12 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/usb/go7007/
  
 +GOCONTROLL MODULINE MODULE SLOT
 +M:    Maud Spierings <maudspierings@gocontroll.com>
 +S:    Maintained
 +F:    Documentation/connector/gocontroll,moduline-module-slot.yaml
 +
  GOODIX TOUCHSCREEN
- M:    Bastien Nocera <hadess@hadess.net>
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained