Merge tag 'mmc-v5.9-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Sep 2020 16:09:47 +0000 (09:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Sep 2020 16:09:47 +0000 (09:09 -0700)
commit171d4ff79f965c1f164705ef0aaea102a6ad238b
treebb565b6f37ca8f327765a1807464234cc179edd1
parent8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0
parent14801c624066a55139c2c57963eb1b859d0a316a
Merge tag 'mmc-v5.9-rc4-2' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "Fix build warning in mmc_spi when CONFIG_HAS_DMA is unset"

* tag 'mmc-v5.9-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA