]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'mmc-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Feb 2018 17:51:15 +0000 (09:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Feb 2018 17:51:15 +0000 (09:51 -0800)
Pull MMC host fixes from Ulf Hansson:

 - renesas_sdhi: Fix build error in case NO_DMA=y

 - sdhci: Implement a bounce buffer to address throughput regressions

* tag 'mmc-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: MMC_SDHI_{SYS,INTERNAL}_DMAC should depend on HAS_DMA
  mmc: sdhci: Implement an SDHCI-specific bounce buffer


Trivial merge