From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Apr 2021 17:22:54 +0000 (-0700)
Subject: Merge tag 'mmc-v5.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Tag: microblaze-v5.14~223
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=16fc44d6387e260f4932e9248b985837324705d8;p=linux-2.6-microblaze.git

Merge tag 'mmc-v5.12-rc5' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "Replace WARN_ONCE with dev_warn_once for non-optimal sg-alignment in
  the meson-gx host driver"

* tag 'mmc-v5.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: meson-gx: replace WARN_ONCE with dev_warn_once about scatterlist size alignment in block mode
---

16fc44d6387e260f4932e9248b985837324705d8