From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Sep 2020 16:09:47 +0000 (-0700)
Subject: Merge tag 'mmc-v5.9-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Tag: v5.15~2860
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=171d4ff79f965c1f164705ef0aaea102a6ad238b;p=platform%2Fkernel%2Flinux-starfive.git

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
---

171d4ff79f965c1f164705ef0aaea102a6ad238b