Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux...

NAND core changes:
- use longest matching pattern in ->exec_op() default parser
- export NAND operation tracer
- add flag to indicate panic_write in MTD
- use kzalloc() instead of kmalloc() and memset()

Raw NAND controller drivers changes:
- brcmnand:
  * fix BCH ECC layout for large page NAND parts
  * fallback to detected ecc-strength, ecc-step-size
  * when oops in progress use pio and interrupt polling
  * code refactor code to introduce helper functions
  * add support for v7.3 controller
- FSMC:
  * use nand_op_trace for operation tracing
- GPMI:
  * move all driver code into single file
  * various cleanups (including dmaengine changes)
  * use runtime PM to manage clocks
  * implement exec_op
- MTK:
  * correct low level time calculation of r/w cycle
  * improve data sampling timing for read cycle
  * add validity check for CE# pin setting
  * fix wrongly assigned OOB buffer pointer issue
  * re-license MTK NAND driver as Dual MIT/GPL
- STM32:
  * manage the get_irq error case
  * increase DMA completion timeouts

Raw NAND chips drivers changes:
- Macronix: add read-retry support

Onenand driver changes:
- add support for 8Gb datasize chips
- avoid fall-through warnings

SPI-NAND changes:
- define macros for page-read ops with three-byte addresses
- add support for two-byte device IDs and then for GigaDevice
  GD5F1GQ4UFxxG
- add initial support for Paragon PN26G0xA
- handle the case where the last page read has bitflips

diff --combined MAINTAINERS
index b3eb96149591cc5fe29d7931b2d3a6f4804d395e,a6954776a37e70818fa8902f13986f86e735f243..e58f44e3f1037bd7dfaef3d4acd40e9c5d3657b0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -696,6 -696,7 +696,7 @@@ F: drivers/input/mouse/alps.
  ALTERA I2C CONTROLLER DRIVER
  M:    Thor Thayer <[email protected]>
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-altera.txt
  F:    drivers/i2c/busses/i2c-altera.c
  
  ALTERA MAILBOX DRIVER
@@@ -1174,6 -1175,7 +1175,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/arm/arm-boards
  F:    Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt
  F:    Documentation/devicetree/bindings/clock/arm-integrator.txt
+ F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
  F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
  F:    arch/arm/mach-integrator/
@@@ -1781,6 -1783,7 +1783,7 @@@ ARM/LPC18XX ARCHITECTUR
  M:    Vladimir Zapolskiy <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
  F:    arch/arm/boot/dts/lpc43*
  F:    drivers/i2c/busses/i2c-lpc2k.c
  F:    drivers/memory/pl172.c
@@@ -1794,6 -1797,7 +1797,7 @@@ M:      Sylvain Lemieux <slemieux.tyco@gmail
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-pnx.txt
  F:    arch/arm/boot/dts/lpc32*
  F:    arch/arm/mach-lpc32xx/
  F:    drivers/i2c/busses/i2c-pnx.c
@@@ -1918,6 -1922,8 +1922,8 @@@ ARM/NOMADIK/U300/Ux500 ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
+ F:    Documentation/devicetree/bindings/i2c/i2c-stu300.txt
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
@@@ -2140,6 -2146,7 +2146,7 @@@ L:      [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
  F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/boot/dts/rv1108*
  F:    arch/arm/mach-rockchip/
@@@ -2275,6 -2282,7 +2282,7 @@@ M:      Patrice Chotard <patrice.chotard@st.
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.stlinux.com
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-st.txt
  F:    arch/arm/mach-sti/
  F:    arch/arm/boot/dts/sti*
  F:    drivers/char/hw_random/st-rng.c
@@@ -2466,6 -2474,7 +2474,7 @@@ ARM/VT8500 ARM ARCHITECTUR
  M:    Tony Prisk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
@@@ -2531,6 -2540,8 +2540,8 @@@ F:      drivers/cpuidle/cpuidle-zynq.
  F:    drivers/block/xsysace.c
  N:    zynq
  N:    xilinx
+ F:    Documentation/devicetree/bindings/i2c/i2c-cadence.txt
+ F:    Documentation/devicetree/bindings/i2c/i2c-xiic.txt
  F:    drivers/clocksource/timer-cadence-ttc.c
  F:    drivers/i2c/busses/i2c-cadence.c
  F:    drivers/mmc/host/sdhci-of-arasan.c
@@@ -2627,7 -2638,7 +2638,7 @@@ F:      Documentation/devicetree/bindings/ee
  F:    drivers/misc/eeprom/at24.c
  
  ATA OVER ETHERNET (AOE) DRIVER
- M:    "Ed L. Cashin" <[email protected]>
+ M:    "Justin Sanders" <[email protected]>
  W:    http://www.openaoe.org/
  S:    Supported
  F:    Documentation/aoe/
@@@ -2768,7 -2779,7 +2779,7 @@@ AVIA HX711 ANALOG DIGITAL CONVERTER II
  M:    Andreas Klinger <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
+ F:    Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml
  F:    drivers/iio/adc/hx711.c
  
  AX.25 NETWORK LAYER
@@@ -3049,8 -3060,9 +3060,9 @@@ S:      Maintaine
  F:    arch/riscv/net/
  
  BPF JIT for S390
- M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
+ M:    Vasily Gorbik <[email protected]>
+ M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -7305,14 -7317,6 +7317,14 @@@ F:    include/uapi/linux/hyperv.
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
 +HYPERBUS SUPPORT
 +M:    Vignesh Raghavendra <[email protected]>
 +S:    Supported
 +F:    drivers/mtd/hyperbus/
 +F:    include/linux/mtd/hyperbus.h
 +F:    Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
 +F:    Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
 +
  HYPERVISOR VIRTUAL CONSOLE DRIVER
  L:    [email protected]
  S:    Odd Fixes
@@@ -7349,6 -7353,7 +7361,7 @@@ I2C MV64XXX MARVELL AND ALLWINNER DRIVE
  M:    Gregory CLEMENT <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
  F:    drivers/i2c/busses/i2c-mv64xxx.c
  
  I2C OVER PARALLEL PORT
@@@ -8619,14 -8624,12 +8632,12 @@@ F:   arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
- M:    Christoffer Dall <[email protected]>
  M:    Marc Zyngier <[email protected]>
  R:    James Morse <[email protected]>
  R:    Julien Thierry <[email protected]>
  R:    Suzuki K Pouloze <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
- W:    http://systems.cs.columbia.edu/projects/kvm-arm
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  S:    Maintained
  F:    arch/arm/include/uapi/asm/kvm*
@@@ -11076,10 -11079,8 +11087,8 @@@ S:  Supporte
  F:    drivers/net/ethernet/qlogic/netxen/
  
  NFC SUBSYSTEM
- M:    Samuel Ortiz <[email protected]>
- L:    [email protected]
- L:    [email protected] (subscribers-only)
- S:    Supported
+ L:    [email protected]
+ S:    Orphan
  F:    net/nfc/
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
@@@ -11236,7 -11237,7 +11245,7 @@@ F:   drivers/video/fbdev/riva
  F:    drivers/video/fbdev/nvidia/
  
  NVM EXPRESS DRIVER
- M:    Keith Busch <k[email protected]>
+ M:    Keith Busch <k[email protected]>
  M:    Jens Axboe <[email protected]>
  M:    Christoph Hellwig <[email protected]>
  M:    Sagi Grimberg <[email protected]>
@@@ -11736,6 -11737,7 +11745,7 @@@ M:   Peter Korsgaard <[email protected]
  M:    Andrew Lunn <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-ocores.txt
  F:    Documentation/i2c/busses/i2c-ocores
  F:    drivers/i2c/busses/i2c-ocores.c
  F:    include/linux/platform_data/i2c-ocores.h
@@@ -13375,6 -13377,7 +13385,7 @@@ F:   drivers/clk/renesas
  RENESAS EMEV2 I2C DRIVER
  M:    Wolfram Sang <[email protected]>
  S:    Supported
+ F:    Documentation/devicetree/bindings/i2c/i2c-emev2.txt
  F:    drivers/i2c/busses/i2c-emev2.c
  
  RENESAS ETHERNET DRIVERS
@@@ -13396,6 -13399,8 +13407,8 @@@ F:   drivers/iio/adc/rcar-gyroadc.
  RENESAS R-CAR I2C DRIVERS
  M:    Wolfram Sang <[email protected]>
  S:    Supported
+ F:    Documentation/devicetree/bindings/i2c/i2c-rcar.txt
+ F:    Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
@@@ -13626,8 -13631,9 +13639,9 @@@ S:   Maintaine
  F:    drivers/video/fbdev/savage/
  
  S390
- M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
+ M:    Vasily Gorbik <[email protected]>
+ M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
@@@ -14361,7 -14367,7 +14375,7 @@@ SIMPLEFB FB DRIVE
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/devicetree/bindings/display/simple-framebuffer.txt
+ F:    Documentation/devicetree/bindings/display/simple-framebuffer.yaml
  F:    drivers/video/fbdev/simplefb.c
  F:    include/linux/platform_data/simplefb.h
  
@@@ -15684,6 -15690,7 +15698,7 @@@ R:   Bartosz Golaszewski <bgolaszewski@ba
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
  S:    Supported
+ F:    Documentation/devicetree/bindings/i2c/i2c-davinci.txt
  F:    arch/arm/mach-davinci/
  F:    drivers/i2c/busses/i2c-davinci.c
  F:    arch/arm/boot/dts/da850*
@@@ -17387,6 -17394,7 +17402,7 @@@ M:   Jan Glauber <[email protected]
  L:    [email protected]
  W:    http://www.cavium.com
  S:    Supported
+ F:    Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt
  F:    drivers/i2c/busses/i2c-xlp9xx.c
  
  XRA1403 GPIO EXPANDER

diff --combined include/linux/mtd/cfi.h
index 7fdbc1ff6527cdeb3f0d39e6b8bfdc0574784269,208c87cf2e3e113ffcbb5bb7ed80922dab438bf6..c98a211086880a84c9c82abd5a6320ef363468fe
--- 1/include/linux/mtd/cfi.h
--- 2/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@@ -1,20 -1,6 +1,6 @@@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
  /*
   * Copyright © 2000-2010 David Woodhouse <[email protected]> et al.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  *
   */
  
  #ifndef __MTD_CFI_H__
@@@ -233,13 -219,6 +219,13 @@@ struct cfi_pri_amdstd 
        uint8_t  VppMin;
        uint8_t  VppMax;
        uint8_t  TopBottom;
 +      /* Below field are added from version 1.5 */
 +      uint8_t  ProgramSuspend;
 +      uint8_t  UnlockBypass;
 +      uint8_t  SecureSiliconSector;
 +      uint8_t  SoftwareFeatures;
 +#define CFI_POLL_STATUS_REG   BIT(0)
 +#define CFI_POLL_DQ           BIT(1)
  } __packed;
  
  /* Vendor-Specific PRI for Atmel chips (command set 0x0002) */