Merge tag 'spi-fix-v5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Sep 2021 19:14:33 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Sep 2021 19:14:33 +0000 (12:14 -0700)
commit4c17ca27923c16fd73bbb9ad033c7d749c3bcfcc
tree60b52872c93da47b2cfdf1ce7a7446d3738437dd
parent2ff59bad6f24813e4c9e8f2022684010ec0e58d2
parent2bab94090b01bc593d8bc25f68df41f198721173
Merge tag 'spi-fix-v5.15-rc2' of git://git./linux/kernel/git/broonie/spi

Pull spi fixes from Mark BrownL
 "This contains a couple of fixes, one fix for handling of zero length
  transfers on Rockchip devices and a warning fix which will conflict
  with a version you did but cleans up some extra unneeded forward
  declarations as well which seems a bit neater"

* tag 'spi-fix-v5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: tegra20-slink: Declare runtime suspend and resume functions conditionally
  spi: rockchip: handle zero length transfers without timing out