From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Thu, 2 Sep 2021 22:04:16 +0000 (+0200)
Subject: Merge tag 'nand/for-5.15' into mtd/next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c1fe77e42440d2cad76055df6fb58caabf622d51;p=linux.git

Merge tag 'nand/for-5.15' into mtd/next

NAND core changes:
* Repair Miquel Raynal's email address in MAINTAINERS
* Fix a couple of spelling mistakes in Kconfig
* bbt: Skip bad blocks when searching for the BBT in NAND
* Remove never changed ret variable

Raw NAND changes:
* cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()'
* intel: Fix error handling in probe
* omap: Fix kernel doc warning on 'calcuate' typo
* gpmc: Fix the ECC bytes vs. OOB bytes equation

SPI-NAND core changes:
* Properly fill the OOB area.
* Fix comment

SPI-NAND drivers changes:
* macronix: Add Quad support for serial NAND flash
---

c1fe77e42440d2cad76055df6fb58caabf622d51