From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Sep 2020 18:11:13 +0000 (-0700)
Subject: Merge tag 'mtd/fixes-for-5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~2900
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92373933f7dc0b311804d7d45bdae2aced81da23;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mtd/fixes-for-5.9-rc6' of git://git./linux/kernel/git/mtd/linux

Pull MTD/SPI NOR fixes from Vignesh Raghavendra:
 "Revert patches that caused non volatile Quad Enable bit to be cleared
  for certain SPI NOR flashes during module remove or during shutdown,
  thus breaking backward compatibility"

Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>

* tag 'mtd/fixes-for-5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  Revert "mtd: spi-nor: Add capability to disable flash quad mode"
  Revert "mtd: spi-nor: Disable the flash quad mode in spi_nor_restore()"
---

92373933f7dc0b311804d7d45bdae2aced81da23