Merge branch 'for-4.15/dax' into libnvdimm-for-next

diff --combined MAINTAINERS
index 456ba0725b8dab4288b448809aba048fd9690214,2d3d750b19c0cddf8af39786faed78709f7bbba1..65eff7857ec3815e6d665370ded0f7c699b62c14
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4162,7 -4162,7 +4162,7 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
 -DIRECT ACCESS (DAX)
 +FILESYSTEM DIRECT ACCESS (DAX)
  M:    Matthew Wilcox <[email protected]>
  M:    Ross Zwisler <[email protected]>
  L:    [email protected]
@@@ -4171,12 -4171,6 +4171,12 @@@ F:    fs/dax.
  F:    include/linux/dax.h
  F:    include/trace/events/fs_dax.h
  
 +DEVICE DIRECT ACCESS (DAX)
 +M:    Dan Williams <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/dax/
 +
  DIRECTORY NOTIFICATION (DNOTIFY)
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -5265,7 -5259,8 +5265,8 @@@ S:      Maintaine
  F:    drivers/iommu/exynos-iommu.c
  
  EZchip NPS platform support
- M:    Noam Camus <[email protected]>
+ M:    Elad Kanfi <[email protected]>
+ M:    Vineet Gupta <[email protected]>
  S:    Supported
  F:    arch/arc/plat-eznps
  F:    arch/arc/boot/dts/eznps.dts
@@@ -6744,7 -6739,7 +6745,7 @@@ F:      Documentation/devicetree/bindings/au
  F:    drivers/auxdisplay/img-ascii-lcd.c
  
  IMGTEC IR DECODER DRIVER
- M:    James Hogan <j[email protected]>
+ M:    James Hogan <j[email protected]>
  S:    Maintained
  F:    drivers/media/rc/img-ir/
  
@@@ -7568,7 -7563,7 +7569,7 @@@ F:      arch/arm64/include/asm/kvm
  F:    arch/arm64/kvm/
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
- M:    James Hogan <j[email protected]>
+ M:    James Hogan <j[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/mips/include/uapi/asm/kvm*
@@@ -8270,6 -8265,12 +8271,12 @@@ L:    [email protected]
  S:    Orphan
  F:    drivers/net/wireless/marvell/libertas/
  
+ MARVELL MACCHIATOBIN SUPPORT
+ M:    Russell King <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+ 
  MARVELL MV643XX ETHERNET DRIVER
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected]
@@@ -8603,6 -8604,12 +8610,12 @@@ M:    Sean Wang <[email protected]
  S:    Maintained
  F:    drivers/media/rc/mtk-cir.c
  
+ MEDIATEK PMIC LED DRIVER
+ M:    Sean Wang <[email protected]>
+ S:    Maintained
+ F:    drivers/leds/leds-mt6323.c
+ F:    Documentation/devicetree/bindings/leds/leds-mt6323.txt
+ 
  MEDIATEK ETHERNET DRIVER
  M:    Felix Fietkau <[email protected]>
  M:    John Crispin <[email protected]>
@@@ -8885,7 -8892,7 +8898,7 @@@ F:      Documentation/devicetree/bindings/me
  T:    git git://linuxtv.org/media_tree.git
  
  METAG ARCHITECTURE
- M:    James Hogan <j[email protected]>
+ M:    James Hogan <j[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
  S:    Odd Fixes
@@@ -9354,7 -9361,7 +9367,7 @@@ NETWORK BLOCK DEVICE (NBD
  M:    Josef Bacik <[email protected]>
  S:    Maintained
  L:    [email protected]
- L:    nbd[email protected]
+ L:    nbd@other.debian.org
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
  F:    include/uapi/linux/nbd.h
@@@ -12931,9 -12938,9 +12944,9 @@@ F:   drivers/mmc/host/dw_mmc
  SYNOPSYS HSDK RESET CONTROLLER DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Supported
- F:    drivers/reset/reset-hsdk-v1.c
- F:    include/dt-bindings/reset/snps,hsdk-v1-reset.h
- F:    Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
+ F:    drivers/reset/reset-hsdk.c
+ F:    include/dt-bindings/reset/snps,hsdk-reset.h
+ F:    Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt
  
  SYSTEM CONFIGURATION (SYSCON)
  M:    Lee Jones <[email protected]>