Merge tag 'spi-fix-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jul 2023 15:51:02 +0000 (08:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jul 2023 15:51:02 +0000 (08:51 -0700)
Pull spi fixes from Mark Brown:
 "A couple of fairly minor driver specific fixes here, plus a bunch of
  maintainership and admin updates. Nothing too remarkable"

* tag 'spi-fix-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  mailmap: add entry for Jonas Gorski
  MAINTAINERS: add myself for spi-bcm63xx
  spi: s3c64xx: clear loopback bit after loopback test
  spi: bcm63xx: fix max prepend length
  MAINTAINERS: Add myself as a maintainer for Microchip SPI

1  2 
.mailmap
MAINTAINERS

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
@@@ -4121,8 -4169,15 +4121,15 @@@ F:    Documentation/devicetree/bindings/sp
  F:    drivers/spi/spi-bcm63xx-hsspi.c
  F:    drivers/spi/spi-bcmbca-hsspi.c
  
+ BROADCOM BCM6348/BCM6358 SPI controller DRIVER
+ M:    Jonas Gorski <jonas.gorski@gmail.com>
+ L:    linux-spi@vger.kernel.org
+ S:    Odd Fixes
+ F:    Documentation/devicetree/bindings/spi/spi-bcm63xx.txt
+ F:    drivers/spi/spi-bcm63xx.c
  BROADCOM ETHERNET PHY DRIVERS
 -M:    Florian Fainelli <f.fainelli@gmail.com>
 +M:    Florian Fainelli <florian.fainelli@broadcom.com>
  R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Supported