Merge tag 'nand/for-4.14' of git://git.infradead.org/l2-mtd into mtd/next

From Boris:
"
This pull request contains the following core changes:

* Fix memory leaks in the core
* Remove unused NAND locking support
* Rename nand.h into rawnand.h (preparing support for spi NANDs)
* Use NAND_MAX_ID_LEN where appropriate
* Fix support for 20nm Hynix chips
* Fix support for Samsung and Hynix SLC NANDs

and the following driver changes:

* Various cleanup, improvements and fixes in the qcom driver
* Fixes for bugs detected by various static code analysis tools
* Fix mxc ooblayout definition
* Add a new part_parsers to tmio and sharpsl platform data in order to
  define a custom list of partition parsers
* Request the reset line in exclusive mode in the sunxi driver
* Fix a build error in the orion-nand driver when compiled for ARMv4
* Allow 64-bit mvebu platforms to select the PXA3XX driver
"

diff --cc MAINTAINERS
index 1c3feffb1c1cfd2b46685907300a9f026fb67e6a,bffb38373550d8a9b2daf64d2e01d30e33cbebc2..1c0cc17f48547151171b31d312ab6876de695956
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9027,8 -9034,12 +9027,8 @@@ T:     git git://git.infradead.org/linux-mt
  T:    git git://git.infradead.org/l2-mtd.git nand/next
  S:    Maintained
  F:    drivers/mtd/nand/
- F:    include/linux/mtd/nand*.h
+ F:    include/linux/mtd/*nand*.h
  
 -NATSEMI ETHERNET DRIVER (DP8381x)
 -S:    Orphan
 -F:    drivers/net/ethernet/natsemi/natsemi.c
 -
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <zonque@gmail.com>
  S:    Maintained

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc drivers/mtd/nand/atmel/nand-controller.c
Simple merge

diff --cc drivers/mtd/nand/atmel/pmecc.c
Simple merge

diff --cc drivers/mtd/nand/nand_base.c
Simple merge

diff --cc drivers/mtd/nand/nand_timings.c
Simple merge

diff --cc drivers/mtd/nand/nandsim.c
Simple merge

diff --cc drivers/mtd/nand/sunxi_nand.c
Simple merge

diff --cc include/linux/mtd/rawnand.h
Simple merge