Merge tag 'imx-maintainers-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

i.MX maintainers update for 4.18:
 - Add NXP linux team as a reviewer for i.MX platform support.

* tag 'imx-maintainers-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  MAINTAINERS: add NXP linux team maillist as i.MX reviewer

diff --combined MAINTAINERS
index 58b9861ccf995d73c96da993ce8900f180982e8f,1defbc831a8f686435d1876883eb7bb0e71d0314..10cfa0d166ef8c7b74080ce5c2b98fe74f91d1ca
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -137,9 -137,9 +137,9 @@@ Maintainers List (try to look for most 
                -----------------------------------
  
  3C59X NETWORK DRIVER
 -M:    Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
 +M:    Steffen Klassert <klassert@kernel.org>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/networking/vortex.txt
  F:    drivers/net/ethernet/3com/3c59x.c
  
@@@ -564,9 -564,8 +564,9 @@@ S: Maintaine
  F:    drivers/media/dvb-frontends/af9033*
  
  AFFS FILE SYSTEM
 +M:    David Sterba <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Odd Fixes
  F:    Documentation/filesystems/affs.txt
  F:    fs/affs/
  
@@@ -906,8 -905,6 +906,8 @@@ ANDROID ION DRIVE
  M:    Laura Abbott <[email protected]>
  M:    Sumit Semwal <[email protected]>
  L:    [email protected]
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
@@@ -1211,6 -1208,7 +1211,6 @@@ F:      drivers/*/*alpine
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
  M:    Lars Persson <[email protected]>
 -M:    Niklas Cassel <[email protected]>
  S:    Maintained
  L:    [email protected]
  F:    arch/arm/mach-artpec
@@@ -1375,8 -1373,7 +1375,8 @@@ F:      arch/arm/mach-ebsa110
  F:    drivers/net/ethernet/amd/am79c961a.*
  
  ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 -M:    Uwe Kleine-König <[email protected]>
 +M:    Uwe Kleine-König <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  N:    efm32
@@@ -1404,9 -1401,9 +1404,10 @@@ F:     arch/arm/mach-footbridge
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  M:    Shawn Guo <[email protected]>
 -M:    Sascha Hauer <[email protected]>
 +M:    Sascha Hauer <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
  R:    Fabio Estevam <[email protected]>
+ R:    NXP Linux Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@ -1420,8 -1417,7 +1421,8 @@@ F:      include/soc/imx
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
  M:    Shawn Guo <[email protected]>
 -M:    Sascha Hauer <[email protected]>
 +M:    Sascha Hauer <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
  R:    Stefan Agner <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2554,6 -2550,7 +2555,6 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/atmel/tse850-pcm5142.c
  
  AZ6007 DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -2618,7 -2615,7 +2619,7 @@@ S:      Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 -M:    Michael Lyle <[email protected]>
 +M:    Coly Li <[email protected]>
  M:    Kent Overstreet <[email protected]>
  L:    [email protected]
  W:    http://bcache.evilpiepirate.org
@@@ -3082,6 -3079,7 +3083,6 @@@ F:      include/linux/btrfs
  F:    include/uapi/linux/btrfs*
  
  BTTV VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -3691,6 -3689,7 +3692,6 @@@ F:      drivers/cpufreq/arm_big_little_dt.
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3809,6 -3808,7 +3810,6 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cx24120*
  
  CX88 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -4246,9 -4246,6 +4247,9 @@@ F:      include/trace/events/fs_dax.
  
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <[email protected]>
 +M:    Dave Jiang <[email protected]>
 +M:    Ross Zwisler <[email protected]>
 +M:    Vishal Verma <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/dax/
@@@ -5049,6 -5046,7 +5050,6 @@@ F:      drivers/edac/thunderx_edac
  
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
@@@ -5077,6 -5075,7 +5078,6 @@@ S:      Maintaine
  F:    drivers/edac/fsl_ddr_edac.*
  
  EDAC-GHES
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5093,18 -5092,21 +5094,18 @@@ S:   Maintaine
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5154,6 -5156,7 +5155,6 @@@ S:      Maintaine
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5212,6 -5215,7 +5213,6 @@@ S:      Maintaine
  F:    drivers/net/ethernet/ibm/ehea/
  
  EM28XX VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -5649,8 -5653,7 +5650,8 @@@ F:      drivers/net/ethernet/freescale/fec.
  F:    Documentation/devicetree/bindings/net/fsl-fec.txt
  
  FREESCALE IMX / MXC FRAMEBUFFER DRIVER
 -M:    Sascha Hauer <[email protected]>
 +M:    Sascha Hauer <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -5782,14 -5785,6 +5783,14 @@@ F:    fs/crypto
  F:    include/linux/fscrypt*.h
  F:    Documentation/filesystems/fscrypt.rst
  
 +FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE
 +M:    Jan Kara <[email protected]>
 +R:    Amir Goldstein <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    fs/notify/
 +F:    include/linux/fsnotify*.h
 +
  FUJITSU LAPTOP EXTRAS
  M:    Jonathan Woithe <[email protected]>
  L:    [email protected]
@@@ -6262,7 -6257,7 +6263,7 @@@ S:      Odd Fixe
  F:    drivers/media/usb/hdpvr/
  
  HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
 -M:    Jimmy Vance <jimmy.vance@hpe.com>
 +M:    Jerry Hoemann <jerry.hoemann@hpe.com>
  S:    Supported
  F:    Documentation/watchdog/hpwdt.txt
  F:    drivers/watchdog/hpwdt.c
@@@ -7402,6 -7397,16 +7403,6 @@@ S:     Obsolet
  F:    include/uapi/linux/ipx.h
  F:    drivers/staging/ipx/
  
 -IRDA SUBSYSTEM
 -M:    Samuel Ortiz <[email protected]>
 -L:    [email protected] (subscribers-only)
 -L:    [email protected]
 -W:    http://irda.sourceforge.net/
 -S:    Obsolete
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
 -F:    Documentation/networking/irda.txt
 -F:    drivers/staging/irda/
 -
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
  S:    Maintained
@@@ -7666,11 -7671,9 +7667,11 @@@ L:    [email protected]
  S:    Maintained
  F:    Documentation/kbuild/
  F:    Makefile
 -F:    scripts/Makefile.*
 +F:    scripts/Kbuild*
 +F:    scripts/Makefile*
  F:    scripts/basic/
  F:    scripts/mk*
 +F:    scripts/mod/
  F:    scripts/package/
  
  KERNEL JANITORS
@@@ -7695,6 -7698,7 +7696,6 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL SELFTEST FRAMEWORK
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
@@@ -7735,7 -7739,7 +7736,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -7749,7 -7753,7 +7750,7 @@@ F:      virt/kvm/arm
  F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -8045,9 -8049,6 +8046,9 @@@ F:      tools/lib/lockdep
  
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
  M:    Ross Zwisler <[email protected]>
 +M:    Dan Williams <[email protected]>
 +M:    Vishal Verma <[email protected]>
 +M:    Dave Jiang <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
@@@ -8056,9 -8057,6 +8057,9 @@@ F:      drivers/nvdimm/region_devs.
  
  LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
  M:    Vishal Verma <[email protected]>
 +M:    Dan Williams <[email protected]>
 +M:    Ross Zwisler <[email protected]>
 +M:    Dave Jiang <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
@@@ -8066,9 -8064,6 +8067,9 @@@ F:      drivers/nvdimm/btt
  
  LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
  M:    Ross Zwisler <[email protected]>
 +M:    Dan Williams <[email protected]>
 +M:    Vishal Verma <[email protected]>
 +M:    Dave Jiang <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
@@@ -8084,9 -8079,6 +8085,9 @@@ F:      Documentation/devicetree/bindings/pm
  
  LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
  M:    Dan Williams <[email protected]>
 +M:    Ross Zwisler <[email protected]>
 +M:    Vishal Verma <[email protected]>
 +M:    Dave Jiang <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
@@@ -8861,6 -8853,7 +8862,6 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/staging/media/tegra-vde/
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  P:    LinuxTV.org Project
  L:    [email protected]
@@@ -9714,7 -9707,6 +9715,7 @@@ W:      https://fedorahosted.org/dropwatch
  F:    net/core/drop_monitor.c
  
  NETWORKING DRIVERS
 +M:    "David S. Miller" <[email protected]>
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
@@@ -9774,7 -9766,6 +9775,7 @@@ F:      include/uapi/linux/net_namespace.
  F:    tools/testing/selftests/net/
  F:    lib/net_utils.c
  F:    lib/random32.c
 +F:    Documentation/networking/
  
  NETWORKING [IPSEC]
  M:    Steffen Klassert <[email protected]>
@@@ -9871,7 -9862,7 +9872,7 @@@ F:      include/linux/platform_data/nxp-nci.
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
 -M:    Trond Myklebust <trond.myklebust@primarydata.com>
 +M:    Trond Myklebust <trond.myklebust@hammerspace.com>
  M:    Anna Schumaker <[email protected]>
  L:    [email protected]
  W:    http://client.linux-nfs.org
@@@ -10891,6 -10882,7 +10892,6 @@@ F:   drivers/pci/host
  F:    drivers/pci/dwc/
  
  PCIE DRIVER FOR AXIS ARTPEC
 -M:    Niklas Cassel <[email protected]>
  M:    Jesper Nilsson <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -12249,6 -12241,7 +12250,6 @@@ S:   Odd Fixe
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -12487,7 -12480,6 +12488,7 @@@ F:   drivers/scsi/st_*.
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
 +M:    Marcelo Ricardo Leitner <[email protected]>
  L:    [email protected]
  W:    http://lksctp.sourceforge.net
  S:    Maintained
@@@ -12753,6 -12745,7 +12754,6 @@@ S:   Maintaine
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -12824,8 -12817,7 +12825,8 @@@ F:   include/linux/siphash.
  
  SIOX
  M:    Gavin Schenk <[email protected]>
 -M:    Uwe Kleine-König <[email protected]>
 +M:    Uwe Kleine-König <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
  S:    Supported
  F:    drivers/siox/*
  F:    include/trace/events/siox.h
@@@ -13743,6 -13735,7 +13744,6 @@@ S:   Maintaine
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13751,6 -13744,7 +13752,6 @@@ S:   Odd fixe
  F:    drivers/media/tuners/tea5761.*
  
  TEA5767 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13840,6 -13834,7 +13841,6 @@@ S:   Supporte
  F:    drivers/iommu/tegra*
  
  TEGRA KBC DRIVER
 -M:    Rakesh Iyer <[email protected]>
  M:    Laxman Dewangan <[email protected]>
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
@@@ -13942,7 -13937,7 +13943,7 @@@ THUNDERBOLT DRIVE
  M:    Andreas Noever <[email protected]>
  M:    Michael Jamet <[email protected]>
  M:    Mika Westerberg <[email protected]>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
  F:    Documentation/admin-guide/thunderbolt.rst
@@@ -13952,7 -13947,7 +13953,7 @@@ F:   include/linux/thunderbolt.
  THUNDERBOLT NETWORK DRIVER
  M:    Michael Jamet <[email protected]>
  M:    Mika Westerberg <[email protected]>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/thunderbolt.c
@@@ -14166,6 -14161,7 +14167,6 @@@ F:   Documentation/networking/tlan.tx
  F:    drivers/net/ethernet/ti/tlan.*
  
  TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -14648,6 -14644,7 +14649,6 @@@ F:   drivers/usb/common/usb-otg-fsm.
  
  USB OVER IP DRIVER
  M:    Valentina Manea <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -15391,6 -15388,7 +15392,6 @@@ S:   Maintaine
  F:    arch/x86/entry/vdso/
  
  XC2028/3028 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org