From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Sep 2021 19:14:33 +0000 (-0700)
Subject: Merge tag 'spi-fix-v5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... 
X-Git-Tag: baikal/mips/sdk5.9~10024
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=8af866999360413d27d005465738a7f13eab584e;p=kernel.git

Merge tag 'spi-fix-v5.15-rc2' of git://git.kernel.org/pub/scm/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
---

8af866999360413d27d005465738a7f13eab584e