From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Oct 2020 17:10:52 +0000 (-0700)
Subject: Merge tag 'mmc-v5.9-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Tag: ceph-for-5.10-rc1~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f318052ef2f07da2cd0c535d0d2900d5080a47e1;p=ceph-client.git

Merge tag 'mmc-v5.9-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "Assign a proper discard granularity rather than incorrectly set it to
  zero"

* tag 'mmc-v5.9-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: core: don't set limits.discard_granularity as 0
---

f318052ef2f07da2cd0c535d0d2900d5080a47e1