Merge tag 'ntb-4.2' of git://github.com/jonmason/ntb

Pull NTB updates from Jon Mason:
 "This includes a pretty significant reworking of the NTB core code, but
  has already produced some significant performance improvements.

  An abstraction layer was added to allow the hardware and clients to be
  easily added.  This required rewriting the NTB transport layer for
  this abstraction layer.  This modification will allow future "high
  performance" NTB clients.

  In addition to this change, a number of performance modifications were
  added.  These changes include NUMA enablement, using CPU memcpy
  instead of asyncdma, and modification of NTB layer MTU size"

* tag 'ntb-4.2' of git://github.com/jonmason/ntb: (22 commits)
  NTB: Add split BAR output for debugfs stats
  NTB: Change WARN_ON_ONCE to pr_warn_once on unsafe
  NTB: Print driver name and version in module init
  NTB: Increase transport MTU to 64k from 16k
  NTB: Rename Intel code names to platform names
  NTB: Default to CPU memcpy for performance
  NTB: Improve performance with write combining
  NTB: Use NUMA memory in Intel driver
  NTB: Use NUMA memory and DMA chan in transport
  NTB: Rate limit ntb_qp_link_work
  NTB: Add tool test client
  NTB: Add ping pong test client
  NTB: Add parameters for Intel SNB B2B addresses
  NTB: Reset transport QP link stats on down
  NTB: Do not advance transport RX on link down
  NTB: Differentiate transport link down messages
  NTB: Check the device ID to set errata flags
  NTB: Enable link for Intel root port mode in probe
  NTB: Read peer info from local SPAD in transport
  NTB: Split ntb_hw_intel and ntb_transport drivers
  ...

diff --combined MAINTAINERS
index e23ff1cbd12b5f53fe19ce4398b1940d330d423a,a682805d6d563b5d31eac2734ed0c9a9b2aa6a7d..bbb6aeb78b5261d092ec00d2a9f782dd6c6e7ba5
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -259,7 -259,7 +259,7 @@@ S: Maintaine
  F:    drivers/platform/x86/acer-wmi.c
  
  ACPI
 -M:    Rafael J. Wysocki <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  W:    https://01.org/linux-acpi
@@@ -280,7 -280,7 +280,7 @@@ F: tools/power/acpi
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <robert.moore@intel.com>
  M:    Lv Zheng <lv.zheng@intel.com>
 -M:    Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 +M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
  L:    linux-acpi@vger.kernel.org
  L:    devel@acpica.org
  W:    https://acpica.org/
@@@ -445,7 -445,6 +445,7 @@@ F: drivers/input/misc/adxl34x.
  
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <matthew@wil.cx>
 +M:    Hannes Reinecke <hare@suse.de>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    Documentation/scsi/advansys.txt
@@@ -632,7 -631,7 +632,7 @@@ F: drivers/iommu/amd_iommu*.[ch
  F:    include/linux/amd-iommu.h
  
  AMD KFD
 -M:    Oded Gabbay <oded.gabbay@amd.com>
 +M:    Oded Gabbay <oded.gabbay@gmail.com>
  L:    dri-devel@lists.freedesktop.org
  T:    git git://people.freedesktop.org/~gabbayo/linux.git
  S:    Supported
@@@ -653,6 -652,7 +653,6 @@@ M: Tom Lendacky <thomas.lendacky@amd.co
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/amd/xgbe/
 -F:    drivers/net/phy/amd-xgbe-phy.c
  
  AMS (Apple Motion Sensor) DRIVER
  M:    Michael Hanselmann <linux-kernel@hansmi.ch>
@@@ -732,7 -732,7 +732,7 @@@ ANDROID DRIVER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Arve Hjønnevåg <arve@android.com>
  M:    Riley Andrews <riandrews@android.com>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  L:    devel@driverdev.osuosl.org
  S:    Supported
  F:    drivers/android/
@@@ -922,13 -922,6 +922,13 @@@ M:       Krzysztof Halasa <khalasa@piap.pl
  S:    Maintained
  F:    arch/arm/mach-cns3xxx/
  
 +ARM/CAVIUM THUNDER NETWORK DRIVER
 +M:    Sunil Goutham <sgoutham@cavium.com>
 +M:    Robert Richter <rric@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/net/ethernet/cavium/
 +
  ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
  M:    Alexander Shiyan <shc_work@mail.ru>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -984,7 -977,6 +984,7 @@@ L: linux-arm-kernel@lists.infradead.or
  T:    git git://github.com/ulli-kroll/linux.git
  S:    Maintained
  F:    arch/arm/mach-gemini/
 +F:    drivers/rtc/rtc-gemini.c
  
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
  M:    Barry Song <baohua@kernel.org>
@@@ -1043,7 -1035,7 +1043,7 @@@ F:      arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 -M:    Shawn Guo <shawn.guo@linaro.org>
 +M:    Shawn Guo <shawnguo@kernel.org>
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -1052,11 -1044,9 +1052,11 @@@ F:    arch/arm/mach-imx
  F:    arch/arm/mach-mxs/
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
 +F:    drivers/clk/imx/
 +F:    include/soc/imx/
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
 -M:    Shawn Guo <shawn.guo@linaro.org>
 +M:    Shawn Guo <shawnguo@kernel.org>
  M:    Sascha Hauer <kernel@pengutronix.de>
  R:    Stefan Agner <stefan@agner.ch>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1199,12 -1189,6 +1199,12 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/LPC18XX ARCHITECTURE
 +M:    Joachim Eastwood <manabian@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +N:    lpc18xx
 +
  ARM/MAGICIAN MACHINE SUPPORT
  M:    Philipp Zabel <philipp.zabel@gmail.com>
  S:    Maintained
@@@ -1252,13 -1236,6 +1252,13 @@@ W:    http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/Mediatek RTC DRIVER
 +M:    Eddie Huang <eddie.huang@mediatek.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/rtc/rtc-mt6397.c
 +
  ARM/Mediatek SoC support
  M:    Matthias Brugger <matthias.bgg@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1408,7 -1385,6 +1408,7 @@@ L:      linux-samsung-soc@vger.kernel.org (m
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/exynos*
 +F:    arch/arm64/boot/dts/exynos/
  F:    arch/arm/plat-samsung/
  F:    arch/arm/mach-s3c24*/
  F:    arch/arm/mach-s3c64xx/
@@@ -1512,22 -1488,12 +1512,22 @@@ F:   drivers/phy/phy-stih407-usb.
  F:    drivers/phy/phy-stih41x-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
  F:    drivers/reset/sti/
 +F:    drivers/rtc/rtc-st-lpc.c
  F:    drivers/tty/serial/st-asc.c
  F:    drivers/usb/dwc3/dwc3-st.c
  F:    drivers/usb/host/ehci-st.c
  F:    drivers/usb/host/ohci-st.c
 +F:    drivers/watchdog/st_lpc_wdt.c
  F:    drivers/ata/ahci_st.c
  
 +ARM/STM32 ARCHITECTURE
 +M:    Maxime Coquelin <mcoquelin.stm32@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
 +N:    stm32
 +F:    drivers/clocksource/armv7m_systick.c
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1574,13 -1540,6 +1574,13 @@@ F:    drivers/rtc/rtc-ab3100.
  F:    drivers/rtc/rtc-coh901331.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
 +ARM/UNIPHIER ARCHITECTURE
 +M:    Masahiro Yamada <yamada.masahiro@socionext.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-uniphier/
 +N:    uniphier
 +
  ARM/Ux500 ARM ARCHITECTURE
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1658,15 -1617,6 +1658,15 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/z2.c
  F:    arch/arm/mach-pxa/include/mach/z2.h
  
 +ARM/ZTE ARCHITECTURE
 +M:    Jun Nie <jun.nie@linaro.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-zx/
 +F:    drivers/clk/zte/
 +F:    Documentation/devicetree/bindings/arm/zte.txt
 +F:    Documentation/devicetree/bindings/clock/zx296702-clk.txt
 +
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <michal.simek@xilinx.com>
  R:    Sören Brinkmann <soren.brinkmann@xilinx.com>
@@@ -1684,12 -1634,11 +1684,12 @@@ F:   drivers/i2c/busses/i2c-cadence.
  F:    drivers/mmc/host/sdhci-of-arasan.c
  F:    drivers/edac/synopsys_edac.c
  
 -ARM SMMU DRIVER
 +ARM SMMU DRIVERS
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/iommu/arm-smmu.c
 +F:    drivers/iommu/arm-smmu-v3.c
  F:    drivers/iommu/io-pgtable-arm.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
@@@ -1920,14 -1869,6 +1920,14 @@@ W:    http://www.attotech.co
  S:    Supported
  F:    drivers/scsi/esas2r
  
 +ATUSB IEEE 802.15.4 RADIO DRIVER
 +M:    Stefan Schmidt <stefan@osg.samsung.com>
 +L:    linux-wpan@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ieee802154/atusb.c
 +F:    drivers/net/ieee802154/atusb.h
 +F:    drivers/net/ieee802154/at86rf230.h
 +
  AUDIT SUBSYSTEM
  M:    Paul Moore <paul@paul-moore.com>
  M:    Eric Paris <eparis@redhat.com>
@@@ -2026,20 -1967,12 +2026,20 @@@ S:   Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 -M:    Kent Overstreet <kmo@daterainc.com>
 +M:    Kent Overstreet <kent.overstreet@gmail.com>
  L:    linux-bcache@vger.kernel.org
  W:    http://bcache.evilpiepirate.org
 -S:    Maintained:
 +S:    Maintained
  F:    drivers/md/bcache/
  
 +BDISP ST MEDIA DRIVER
 +M:    Fabien Dessenne <fabien.dessenne@st.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Supported
 +F:    drivers/media/platform/sti/bdisp
 +
  BEFS FILE SYSTEM
  S:    Orphan
  F:    Documentation/filesystems/befs.txt
@@@ -2124,7 -2057,6 +2124,7 @@@ M:      Jens Axboe <axboe@kernel.dk
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
 +F:    kernel/trace/blktrace.c
  
  BLOCK2MTD DRIVER
  M:    Joern Engel <joern@lazybastard.org>
@@@ -2229,14 -2161,6 +2229,14 @@@ F:    arch/mips/bcm3384/
  F:    arch/mips/include/asm/mach-bcm3384/*
  F:    arch/mips/kernel/*bmips*
  
 +BROADCOM BCM47XX MIPS ARCHITECTURE
 +M:    Hauke Mehrtens <hauke@hauke-m.de>
 +M:    Rafał Miłecki <zajec5@gmail.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/bcm47xx/*
 +F:    arch/mips/include/asm/mach-bcm47xx/*
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  L:    linux-arm-kernel@lists.infradead.org
@@@ -2269,7 -2193,6 +2269,7 @@@ S:      Maintaine
  F:    arch/arm/mach-bcm/*brcmstb*
  F:    arch/arm/boot/dts/bcm7*.dts*
  F:    drivers/bus/brcmstb_gisb.c
 +N:    brcmstb
  
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Kevin Cernekee <cernekee@gmail.com>
@@@ -2280,7 -2203,7 +2280,7 @@@ S:      Maintaine
  F:    arch/mips/bmips/*
  F:    arch/mips/include/asm/mach-bmips/*
  F:    arch/mips/kernel/*bmips*
 -F:    arch/mips/boot/dts/bcm*.dts*
 +F:    arch/mips/boot/dts/brcm/bcm*.dts*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
  
@@@ -2339,19 -2262,7 +2339,19 @@@ M:    Ray Jui <rjui@broadcom.com
  L:    bcm-kernel-feedback-list@broadcom.com
  S:    Supported
  F:    drivers/gpio/gpio-bcm-kona.c
 -F:    Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
 +F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
 +
 +BROADCOM NVRAM DRIVER
 +M:    Rafał Miłecki <zajec5@gmail.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    drivers/firmware/broadcom/*
 +
 +BROADCOM STB NAND FLASH DRIVER
 +M:    Brian Norris <computersforpeace@gmail.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/brcmnand/
  
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@gmail.com>
@@@ -2532,17 -2443,6 +2532,17 @@@ S:    Maintaine
  F:    drivers/iio/light/cm*
  F:    Documentation/devicetree/bindings/i2c/trivial-devices.txt
  
 +CAVIUM LIQUIDIO NETWORK DRIVER
 +M:     Derek Chickles <derek.chickles@caviumnetworks.com>
 +M:     Satanand Burla <satananda.burla@caviumnetworks.com>
 +M:     Felix Manlunas <felix.manlunas@caviumnetworks.com>
 +M:     Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
 +L:     netdev@vger.kernel.org
 +W:     http://www.cavium.com
 +S:     Supported
 +F:     drivers/net/ethernet/cavium/
 +F:     drivers/net/ethernet/cavium/liquidio/
 +
  CC2520 IEEE-802.15.4 RADIO DRIVER
  M:    Varka Bhadram <varkabhadram@gmail.com>
  L:    linux-wpan@vger.kernel.org
@@@ -2554,6 -2454,7 +2554,6 @@@ F:      Documentation/devicetree/bindings/ne
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
  L:    linuxppc-dev@lists.ozlabs.org
 -L:    cbe-oss-dev@lists.ozlabs.org
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  F:    arch/powerpc/include/asm/cell*.h
@@@ -2563,7 -2464,7 +2563,7 @@@ F:      arch/powerpc/oprofile/*cell
  F:    arch/powerpc/platforms/cell/
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT
 -M:    Yan, Zheng <zyan@redhat.com>
 +M:    "Yan, Zheng" <zyan@redhat.com>
  M:    Sage Weil <sage@redhat.com>
  L:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
@@@ -2709,13 -2610,6 +2709,13 @@@ L:    linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/fnic/
  
 +CISCO SCSI HBA DRIVER
 +M:    Narsimhulu Musini <nmusini@cisco.com>
 +M:    Sesidhar Baddela <sebaddel@cisco.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/snic/
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
  M:    Daniel Oliveira Nascimento <don@syst.com.br>
@@@ -2723,14 -2617,6 +2723,14 @@@ L:    platform-driver-x86@vger.kernel.or
  S:    Supported
  F:    drivers/platform/x86/classmate-laptop.c
  
 +COBALT MEDIA DRIVER
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Supported
 +F:    drivers/media/pci/cobalt/
 +
  COCCINELLE/Semantic Patches (SmPL)
  M:    Julia Lawall <Julia.Lawall@lip6.fr>
  M:    Gilles Muller <Gilles.Muller@lip6.fr>
@@@ -2763,7 -2649,7 +2763,7 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/media/platform/coda/
  
  COMMON CLK FRAMEWORK
 -M:    Mike Turquette <mturquette@linaro.org>
 +M:    Michael Turquette <mturquette@baylibre.com>
  M:    Stephen Boyd <sboyd@codeaurora.org>
  L:    linux-clk@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
@@@ -2830,7 -2716,6 +2830,7 @@@ F:      drivers/connector
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <tj@kernel.org>
  M:    Li Zefan <lizefan@huawei.com>
 +M:    Johannes Weiner <hannes@cmpxchg.org>
  L:    cgroups@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
@@@ -2878,7 -2763,7 +2878,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/ti/cpmac.c
  
  CPU FREQUENCY DRIVERS
 -M:    Rafael J. Wysocki <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Viresh Kumar <viresh.kumar@linaro.org>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
@@@ -2917,7 -2802,7 +2917,7 @@@ F:      drivers/cpuidle/cpuidle-exynos.
  F:    arch/arm/mach-exynos/pm.c
  
  CPUIDLE DRIVERS
 -M:    Rafael J. Wysocki <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
@@@ -3003,15 -2888,6 +3003,15 @@@ S:    Maintaine
  F:    drivers/media/common/cx2341x*
  F:    include/media/cx2341x*
  
 +CX24120 MEDIA DRIVER
 +M:    Jemma Denson <jdenson@gmail.com>
 +M:    Patrick Boettcher <patrick.boettcher@posteo.de>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/cx24120*
 +
  CX88 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
@@@ -3086,7 -2962,7 +3086,7 @@@ M:      Michael Neuling <mikey@neuling.org
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    drivers/misc/cxl/
 -F:    include/misc/cxl.h
 +F:    include/misc/cxl*
  F:    include/uapi/misc/cxl.h
  F:    Documentation/powerpc/cxl.txt
  F:    Documentation/powerpc/cxl.txt
@@@ -3216,20 -3092,15 +3216,20 @@@ L:   platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/dell-laptop.c
  
 +DELL LAPTOP RBTN DRIVER
 +M:    Pali Rohár <pali.rohar@gmail.com>
 +S:    Maintained
 +F:    drivers/platform/x86/dell-rbtn.*
 +
  DELL LAPTOP FREEFALL DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
  F:    drivers/platform/x86/dell-smo8800.c
  
  DELL LAPTOP SMM DRIVER
 -M:    Guenter Roeck <linux@roeck-us.net>
 +M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
 -F:    drivers/char/i8k.c
 +F:    drivers/hwmon/dell-smm-hwmon.c
  F:    include/uapi/linux/i8k.h
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
@@@ -3424,8 -3295,6 +3424,8 @@@ F:      drivers/hwmon/dme1737.
  DMI/SMBIOS SUPPORT
  M:    Jean Delvare <jdelvare@suse.de>
  S:    Maintained
 +T:    quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/
 +F:    Documentation/ABI/testing/sysfs-firmware-dmi-tables
  F:    drivers/firmware/dmi-id.c
  F:    drivers/firmware/dmi_scan.c
  F:    include/linux/dmi.h
@@@ -3470,17 -3339,16 +3470,17 @@@ F:   drivers/block/drbd
  F:    lib/lru_cache.c
  F:    Documentation/blockdev/drbd/
  
 -DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
 +DRIVER CORE, KOBJECTS, DEBUGFS, KERNFS AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
  F:    Documentation/kobject.txt
  F:    drivers/base/
 -F:    fs/sysfs/
  F:    fs/debugfs/
 -F:    include/linux/kobj*
 +F:    fs/kernfs/
 +F:    fs/sysfs/
  F:    include/linux/debugfs.h
 +F:    include/linux/kobj*
  F:    lib/kobj*
  
  DRM DRIVERS
@@@ -3586,14 -3454,6 +3586,14 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wan/dscc4.c
  
 +DT3155 MEDIA DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/pci/dt3155/
 +
  DVB_USB_AF9015 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -3876,7 -3736,7 +3876,7 @@@ S:      Maintaine
  F:    drivers/edac/ie31200_edac.c
  
  EDAC-MPC85XX
 -M:    Johannes Thumshirn <johannes.thumshirn@men.de>
 +M:    Johannes Thumshirn <morbidrsa@gmail.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3903,13 -3763,6 +3903,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 +EDAC-XGENE
 +APPLIED MICRO (APM) X-GENE SOC EDAC
 +M:     Loc Ho <lho@apm.com>
 +S:     Supported
 +F:     drivers/edac/xgene_edac.c
 +F:     Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
 +
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -4158,7 -4011,7 +4158,7 @@@ F:      include/uapi/scsi/fc
  
  FILE LOCKING (flock() and fcntl()/lockf())
  M:    Jeff Layton <jlayton@poochiereds.net>
 -M:    J. Bruce Fields <bfields@fieldses.org>
 +M:    "J. Bruce Fields" <bfields@fieldses.org>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    include/linux/fcntl.h
@@@ -4354,7 -4207,7 +4354,7 @@@ F:      sound/soc/fsl/imx
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
  FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
 -M:    J. German Rivera <German.Rivera@freescale.com>
 +M:    "J. German Rivera" <German.Rivera@freescale.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/staging/fsl-mc/
@@@ -4430,11 -4283,9 +4430,11 @@@ FUSE: FILESYSTEM IN USERSPAC
  M:    Miklos Szeredi <miklos@szeredi.hu>
  L:    fuse-devel@lists.sourceforge.net
  W:    http://fuse.sourceforge.net/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
  S:    Maintained
  F:    fs/fuse/
  F:    include/uapi/linux/fuse.h
 +F:    Documentation/filesystems/fuse.txt
  
  FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
  M:    Rik Faith <faith@cs.unc.edu>
@@@ -4638,7 -4489,7 +4638,7 @@@ S:      Maintaine
  F:    drivers/media/usb/gspca/
  
  GUID PARTITION TABLE (GPT)
 -M:    Davidlohr Bueso <davidlohr@hp.com>
 +M:    Davidlohr Bueso <dave@stgolabs.net>
  L:    linux-efi@vger.kernel.org
  S:    Maintained
  F:    block/partitions/efi.*
@@@ -4650,17 -4501,6 +4650,17 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/stk1160/
  
 +H8/300 ARCHITECTURE
 +M:    Yoshinori Sato <ysato@users.sourceforge.jp>
 +L:    uclinux-h8-devel@lists.sourceforge.jp
 +W:    http://uclinux-h8.sourceforge.jp
 +T:    git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
 +S:    Maintained
 +F:    arch/h8300/
 +F:    drivers/clocksource/h8300_*.c
 +F:    drivers/clk/h8300/
 +F:    drivers/irqchip/irq-renesas-h8*.c
 +
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <frank@f-seidel.de>
  L:    platform-driver-x86@vger.kernel.org
@@@ -4810,18 -4650,6 +4810,18 @@@ F:    drivers/hid
  F:    include/linux/hid*
  F:    include/uapi/linux/hid*
  
 +HID SENSOR HUB DRIVERS
 +M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jonathan Cameron <jic23@kernel.org>
 +M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 +L:    linux-input@vger.kernel.org
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hid/hid-sensor*
 +F:    drivers/hid/hid-sensor-*
 +F:    drivers/iio/*/hid-*
 +F:    include/linux/hid-sensor-*
 +
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  M:    Thomas Gleixner <tglx@linutronix.de>
  L:    linux-kernel@vger.kernel.org
@@@ -4928,7 -4756,7 +4928,7 @@@ S:      Maintaine
  F:    fs/hugetlbfs/
  
  Hyper-V CORE AND DRIVERS
 -M:    K. Y. Srinivasan <kys@microsoft.com>
 +M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
  L:    devel@linuxdriverproject.org
  S:    Maintained
@@@ -5283,6 -5111,7 +5283,6 @@@ F:      include/linux/input
  INPUT MULTITOUCH (MT) PROTOCOL
  M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    linux-input@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
  S:    Odd fixes
  F:    Documentation/input/multi-touch-protocol.txt
  F:    drivers/input/input-mt.c
@@@ -5290,12 -5119,13 +5290,12 @@@ K:   \b(ABS|SYN)_MT
  
  INTEL ASoC BDW/HSW DRIVERS
  M:    Jie Yang <yang.jie@linux.intel.com>
 -L:    alsa-devel@alsa-project.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
 -F:    sound/soc/intel/sst-haswell*
 -F:    sound/soc/intel/sst-dsp*
 -F:    sound/soc/intel/sst-firmware.c
 -F:    sound/soc/intel/broadwell.c
 -F:    sound/soc/intel/haswell.c
 +F:    sound/soc/intel/common/sst-dsp*
 +F:    sound/soc/intel/common/sst-firmware.c
 +F:    sound/soc/intel/boards/broadwell.c
 +F:    sound/soc/intel/haswell/
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
@@@ -5466,7 -5296,6 +5466,7 @@@ M:      Tomas Winkler <tomas.winkler@intel.c
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    include/uapi/linux/mei.h
 +F:    include/linux/mei_cl_bus.h
  F:    drivers/misc/mei/*
  F:    Documentation/misc-devices/mei/*
  
@@@ -6108,39 -5937,6 +6108,39 @@@ M:    Sasha Levin <sasha.levin@oracle.com
  S:    Maintained
  F:    tools/lib/lockdep/
  
 +LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 +M:    Dan Williams <dan.j.williams@intel.com>
 +L:    linux-nvdimm@lists.01.org
 +Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +S:    Supported
 +F:    drivers/nvdimm/*
 +F:    include/linux/nd.h
 +F:    include/linux/libnvdimm.h
 +F:    include/uapi/linux/ndctl.h
 +
 +LIBNVDIMM BLK: MMIO-APERTURE DRIVER
 +M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +L:    linux-nvdimm@lists.01.org
 +Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +S:    Supported
 +F:    drivers/nvdimm/blk.c
 +F:    drivers/nvdimm/region_devs.c
 +F:    drivers/acpi/nfit*
 +
 +LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
 +M:    Vishal Verma <vishal.l.verma@intel.com>
 +L:    linux-nvdimm@lists.01.org
 +Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +S:    Supported
 +F:    drivers/nvdimm/btt*
 +
 +LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
 +M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +L:    linux-nvdimm@lists.01.org
 +Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +S:    Supported
 +F:    drivers/nvdimm/pmem.c
 +
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <paulus@au.ibm.com>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
@@@ -6565,15 -6361,6 +6565,15 @@@ W:    http://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-maxiradio*
  
 +MEDIA DRIVERS FOR RENESAS - VSP1
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +L:    linux-sh@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
 +F:    drivers/media/platform/vsp1/
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  P:    LinuxTV.org Project
@@@ -6596,12 -6383,6 +6596,12 @@@ F:    include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 +MEDIATEK MT7601U WIRELESS LAN DRIVER
 +M:    Jakub Kicinski <kubakici@wp.pl>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/wireless/mediatek/mt7601u/
 +
  MEGARAID SCSI/SAS DRIVERS
  M:    Kashyap Desai <kashyap.desai@avagotech.com>
  M:    Sumit Saxena <sumit.saxena@avagotech.com>
@@@ -6648,14 -6429,14 +6648,14 @@@ F:   include/linux/mtd
  F:    include/uapi/mtd/
  
  MEN A21 WATCHDOG DRIVER
 -M:    Johannes Thumshirn <johannes.thumshirn@men.de>
 +M:    Johannes Thumshirn <morbidrsa@gmail.com>
  L:    linux-watchdog@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    drivers/watchdog/mena21_wdt.c
  
  MEN CHAMELEON BUS (mcb)
 -M:    Johannes Thumshirn <johannes.thumshirn@men.de>
 -S:    Supported
 +M:    Johannes Thumshirn <morbidrsa@gmail.com>
 +S:    Maintained
  F:    drivers/mcb/
  F:    include/linux/mcb.h
  
@@@ -6793,8 -6574,9 +6793,8 @@@ S:      Maintaine
  F:    drivers/platform/x86/msi-laptop.c
  
  MSI WMI SUPPORT
 -M:    Anisse Astier <anisse@astier.eu>
  L:    platform-driver-x86@vger.kernel.org
 -S:    Supported
 +S:    Orphan
  F:    drivers/platform/x86/msi-wmi.c
  
  MSI001 MEDIA DRIVER
@@@ -6914,7 -6696,7 +6914,7 @@@ F:      drivers/net/ethernet/natsemi/natsemi
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <zonque@gmail.com>
  S:    Maintained
 -L:    alsa-devel@alsa-project.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://www.native-instruments.com
  F:    sound/usb/caiaq/
  
@@@ -7024,6 -6806,7 +7024,6 @@@ L:      nbd-general@lists.sourceforge.ne
  T:    git git://git.pengutronix.de/git/mpa/linux-nbd.git
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
 -F:    include/linux/nbd.h
  F:    include/uapi/linux/nbd.h
  
  NETWORK DROP MONITOR
@@@ -7212,15 -6995,25 +7212,25 @@@ F:   drivers/power/bq27x00_battery.
  F:    drivers/power/isp1704_charger.c
  F:    drivers/power/rx51_battery.c
  
- NTB DRIVER
+ NTB DRIVER CORE
  M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
+ M:    Allen Hubbe <Allen.Hubbe@emc.com>
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/
  F:    drivers/net/ntb_netdev.c
  F:    include/linux/ntb.h
+ F:    include/linux/ntb_transport.h
+ 
+ NTB INTEL DRIVER
+ M:    Jon Mason <jdmason@kudzu.us>
+ M:    Dave Jiang <dave.jiang@intel.com>
+ S:    Supported
+ W:    https://github.com/jonmason/ntb/wiki
+ T:    git git://github.com/jonmason/ntb.git
+ F:    drivers/ntb/hw/intel/
  
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <anton@tuxera.com>
@@@ -7331,7 -7124,7 +7341,7 @@@ F:      arch/arm/mach-omap2/prm
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  M:    Jarkko Nikula <jarkko.nikula@bitmer.com>
 -L:    alsa-devel@alsa-project.org (subscribers-only)
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    sound/soc/omap/
@@@ -7364,6 -7157,7 +7374,6 @@@ M:      Ohad Ben-Cohen <ohad@wizery.com
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    drivers/hwspinlock/omap_hwspinlock.c
 -F:    arch/arm/mach-omap2/hwspinlock.c
  
  OMAP MMC SUPPORT
  M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
@@@ -7625,16 -7419,13 +7635,16 @@@ S:   Maintaine
  F:    Documentation/mn10300/
  F:    arch/mn10300/
  
 -PARALLEL PORT SUPPORT
 +PARALLEL PORT SUBSYSTEM
 +M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 +M:    Sudip Mukherjee <sudip@vectorindia.org>
  L:    linux-parport@lists.infradead.org (subscribers-only)
 -S:    Orphan
 +S:    Maintained
  F:    drivers/parport/
  F:    include/linux/parport*.h
  F:    drivers/char/ppdev.c
  F:    include/uapi/linux/ppdev.h
 +F:    Documentation/parport*.txt
  
  PARAVIRT_OPS INTERFACE
  M:    Jeremy Fitzhardinge <jeremy@goop.org>
@@@ -7650,6 -7441,7 +7660,6 @@@ F:      arch/*/include/asm/paravirt.
  PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
  M:    Tim Waugh <tim@cyberelk.net>
  L:    linux-parport@lists.infradead.org (subscribers-only)
 -W:    http://www.torque.net/linux-pp.html
  S:    Maintained
  F:    Documentation/blockdev/paride.txt
  F:    drivers/block/paride/
@@@ -8034,7 -7826,7 +8044,7 @@@ F:      include/linux/power_supply.
  F:    drivers/power/
  
  PNP SUPPORT
 -M:    Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 +M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
  S:    Maintained
  F:    drivers/pnp/
  
@@@ -8103,13 -7895,14 +8113,13 @@@ F:   drivers/net/wireless/prism54
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
  L:    netdev@vger.kernel.org
 -L:    cbe-oss-dev@lists.ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/net/ethernet/toshiba/ps3_gelic_net.*
  
  PS3 PLATFORM SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
  L:    linuxppc-dev@lists.ozlabs.org
 -L:    cbe-oss-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/boot/ps3*
  F:    arch/powerpc/include/asm/lv1call.h
@@@ -8123,8 -7916,7 +8133,8 @@@ F:      sound/ppc/snd_ps3
  
  PS3VRAM DRIVER
  M:    Jim Paris <jim@jtan.com>
 -L:    cbe-oss-dev@lists.ozlabs.org
 +M:    Geoff Levand <geoff@infradead.org>
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
@@@ -8209,7 -8001,6 +8219,7 @@@ T:      git git://github.com/hzhuang1/linux.
  T:    git git://github.com/rjarzmik/linux.git
  S:    Maintained
  F:    arch/arm/mach-pxa/
 +F:    drivers/dma/pxa*
  F:    drivers/pcmcia/pxa2xx*
  F:    drivers/spi/spi-pxa2xx*
  F:    drivers/usb/gadget/udc/pxa2*
@@@ -8389,6 -8180,8 +8399,6 @@@ P:      rt2x00 projec
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
 -L:    users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 -W:    http://rt2x00.serialmonkey.com/
  S:    Maintained
  F:    drivers/net/wireless/rt2x00/
  
@@@ -8398,6 -8191,12 +8408,6 @@@ S:     Maintaine
  F:    Documentation/blockdev/ramdisk.txt
  F:    drivers/block/brd.c
  
 -PERSISTENT MEMORY DRIVER
 -M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 -L:    linux-nvdimm@lists.01.org
 -S:    Supported
 -F:    drivers/block/pmem.c
 -
  RANDOM NUMBER DRIVER
  M:    "Theodore Ts'o" <tytso@mit.edu>
  S:    Maintained
@@@ -8472,7 -8271,6 +8482,7 @@@ M:      Alessandro Zummo <a.zummo@towertech.
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
  L:    rtc-linux@googlegroups.com
  Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
  S:    Maintained
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
@@@ -8773,20 -8571,14 +8783,20 @@@ L:   linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/s3c-fb.c
  
 -SAMSUNG MULTIFUNCTION DEVICE DRIVERS
 +SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Sangbeom Kim <sbkim73@samsung.com>
 +M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
  L:    linux-kernel@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
  F:    drivers/mfd/sec*.c
  F:    drivers/regulator/s2m*.c
  F:    drivers/regulator/s5m*.c
 +F:    drivers/clk/clk-s2mps11.c
 +F:    drivers/rtc/rtc-s5m.c
  F:    include/linux/mfd/samsung/
 +F:    Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
 +F:    Documentation/devicetree/bindings/mfd/s2mp*.txt
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -9016,7 -8808,6 +9026,7 @@@ S:      Supporte
  F:    kernel/seccomp.c
  F:    include/uapi/linux/seccomp.h
  F:    include/linux/seccomp.h
 +F:    tools/testing/selftests/seccomp/*
  K:    \bsecure_computing
  K:    \bTIF_SECCOMP\b
  
@@@ -9036,7 -8827,7 +9046,7 @@@ F:      drivers/mmc/host/sdhci-spear.
  
  SECURITY SUBSYSTEM
  M:    James Morris <james.l.morris@oracle.com>
 -M:    Serge E. Hallyn <serge@hallyn.com>
 +M:    "Serge E. Hallyn" <serge@hallyn.com>
  L:    linux-security-module@vger.kernel.org (suggested Cc:)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
  W:    http://kernsec.org/
@@@ -9093,9 -8884,9 +9103,9 @@@ S:      Supporte
  F:    drivers/net/ethernet/emulex/benet/
  
  EMULEX ONECONNECT ROCE DRIVER
 -M:    Selvin Xavier <selvin.xavier@emulex.com>
 -M:    Devesh Sharma <devesh.sharma@emulex.com>
 -M:    Mitesh Ahuja <mitesh.ahuja@emulex.com>
 +M:    Selvin Xavier <selvin.xavier@avagotech.com>
 +M:    Devesh Sharma <devesh.sharma@avagotech.com>
 +M:    Mitesh Ahuja <mitesh.ahuja@avagotech.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.emulex.com
  S:    Supported
@@@ -9256,7 -9047,7 +9266,7 @@@ F:      arch/arm/mach-davinci
  F:    drivers/i2c/busses/i2c-davinci.c
  
  TI DAVINCI SERIES MEDIA DRIVER
 -M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
 +M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
@@@ -9266,7 -9057,7 +9276,7 @@@ F:      drivers/media/platform/davinci
  F:    include/media/davinci/
  
  TI AM437X VPFE DRIVER
 -M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
 +M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
@@@ -9275,7 -9066,7 +9285,7 @@@ S:      Maintaine
  F:    drivers/media/platform/am437x/
  
  OV2659 OMNIVISION SENSOR DRIVER
 -M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
 +M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
@@@ -9595,6 -9386,7 +9605,6 @@@ F:      include/uapi/linux/spi
  
  SPIDERNET NETWORK DRIVER for CELL
  M:    Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
 -M:    Jens Osterkamp <jens@de.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/spider_net.txt
@@@ -9603,6 -9395,7 +9613,6 @@@ F:      drivers/net/ethernet/toshiba/spider_
  SPU FILE SYSTEM
  M:    Jeremy Kerr <jk@ozlabs.org>
  L:    linuxppc-dev@lists.ozlabs.org
 -L:    cbe-oss-dev@lists.ozlabs.org
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  F:    Documentation/filesystems/spufs.txt
@@@ -9741,15 -9534,6 +9751,15 @@@ M:    Forest Bond <forest@alittletooquiet.
  S:    Odd Fixes
  F:    drivers/staging/vt665?/
  
 +STAGING - WILC1000 WIFI DRIVER
 +M:    Johnny Kim <johnny.kim@atmel.com>
 +M:    Rachel Kim <rachel.kim@atmel.com>
 +M:    Dean Lee <dean.lee@atmel.com>
 +M:    Chris Park <chris.park@atmel.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Supported
 +F:    drivers/staging/wilc1000/
 +
  STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
  M:    Arnaud Patard <arnaud.patard@rtp-net.org>
  S:    Odd Fixes
@@@ -9833,20 -9617,6 +9843,20 @@@ F:    arch/arc
  F:    Documentation/devicetree/bindings/arc/
  F:    drivers/tty/serial/arc_uart.c
  
 +SYNOPSYS ARC SDP platform support
 +M:    Alexey Brodkin <abrodkin@synopsys.com>
 +S:    Supported
 +F:    arch/arc/plat-axs10x
 +F:    arch/arc/boot/dts/ax*
 +F:    Documentation/devicetree/bindings/arc/axs10*
 +
 +SYSTEM CONFIGURATION (SYSCON)
 +M:    Lee Jones <lee.jones@linaro.org>
 +M:    Arnd Bergmann <arnd@arndb.de>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 +S:    Supported
 +F:    drivers/mfd/syscon.c
 +
  SYSV FILESYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
  S:    Maintained
@@@ -9855,7 -9625,7 +9865,7 @@@ F:      fs/sysv
  F:    include/linux/sysv_fs.h
  
  TARGET SUBSYSTEM
 -M:    Nicholas A. Bellinger <nab@linux-iscsi.org>
 +M:    "Nicholas A. Bellinger" <nab@linux-iscsi.org>
  L:    linux-scsi@vger.kernel.org
  L:    target-devel@vger.kernel.org
  W:    http://www.linux-iscsi.org
@@@ -9997,7 -9767,7 +10007,7 @@@ F:     include/linux/if_team.
  F:    include/uapi/linux/if_team.h
  
  TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
 -M:    Savoir-faire Linux Inc. <kernel@savoirfairelinux.com>
 +M:    "Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>
  S:    Maintained
  F:    arch/x86/platform/ts5500/
  
@@@ -10188,12 -9958,6 +10198,12 @@@ L:  netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/ti/netcp*
  
 +TI TAS571X FAMILY ASoC CODEC DRIVER
 +M:    Kevin Cernekee <cernekee@chromium.org>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Odd Fixes
 +F:    sound/soc/codecs/tas571x*
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -10368,7 -10132,6 +10378,7 @@@ M:   Greg Kroah-Hartman <gregkh@linuxfoun
  M:    Jiri Slaby <jslaby@suse.cz>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 +F:    Documentation/serial/
  F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -10426,15 -10189,11 +10436,15 @@@ S:        Maintaine
  F:    Documentation/filesystems/ubifs.txt
  F:    fs/ubifs/
  
 -UCLINUX (AND M68KNOMMU)
 +UCLINUX (M68KNOMMU AND COLDFIRE)
  M:    Greg Ungerer <gerg@uclinux.org>
  W:    http://www.uclinux.org/
 +L:    linux-m68k@lists.linux-m68k.org
  L:    uclinux-dev@uclinux.org  (subscribers-only)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
  S:    Maintained
 +F:    arch/m68k/coldfire/
 +F:    arch/m68k/68*/
  F:    arch/m68k/*/*_no.*
  F:    arch/m68k/include/asm/*_no.*
  
@@@ -10768,13 -10527,6 +10778,13 @@@ S: Maintaine
  F:    Documentation/video4linux/zr364xx.txt
  F:    drivers/media/usb/zr364xx/
  
 +ULPI BUS
 +M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/common/ulpi.c
 +F:    include/linux/ulpi/
 +
  USER-MODE LINUX (UML)
  M:    Jeff Dike <jdike@addtoit.com>
  M:    Richard Weinberger <richard@nod.at>
@@@ -10827,12 -10579,6 +10837,12 @@@ F: drivers/vfio
  F:    include/linux/vfio.h
  F:    include/uapi/linux/vfio.h
  
 +VFIO PLATFORM DRIVER
 +M:    Baptiste Reynal <b.reynal@virtualopensystems.com>
 +L:    kvm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/vfio/platform/
 +
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@osciak.com>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -10861,15 -10607,6 +10871,15 @@@ F: drivers/block/virtio_blk.
  F:    include/linux/virtio_*.h
  F:    include/uapi/linux/virtio_*.h
  
 +VIRTIO GPU DRIVER
 +M:    David Airlie <airlied@linux.ie>
 +M:    Gerd Hoffmann <kraxel@redhat.com>
 +L:    dri-devel@lists.freedesktop.org
 +L:    virtualization@lists.linux-foundation.org
 +S:    Maintained
 +F:    drivers/gpu/drm/virtio/
 +F:    include/uapi/linux/virtio_gpu.h
 +
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org
@@@ -11355,13 -11092,6 +11365,13 @@@ L: zd1211-devs@lists.sourceforge.net (s
  S:    Maintained
  F:    drivers/net/wireless/zd1211rw/
  
 +ZPOOL COMPRESSED PAGE STORAGE API
 +M:    Dan Streetman <ddstreet@ieee.org>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    mm/zpool.c
 +F:    include/linux/zpool.h
 +
  ZR36067 VIDEO FOR LINUX DRIVER
  L:    mjpeg-users@lists.sourceforge.net
  L:    linux-media@vger.kernel.org

diff --combined drivers/net/Kconfig
index b7f31150753d8998d317d483300004f1463de301,bda3cde62bb319899d70ddf28fc5d83303fa80a8..c18f9e62a9fa2ea181c7ab2c75faaa9bc713b2ec
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -179,20 -179,6 +179,20 @@@ config VXLA
          To compile this driver as a module, choose M here: the module
          will be called vxlan.
  
 +config GENEVE
 +       tristate "Generic Network Virtualization Encapsulation netdev"
 +       depends on INET && GENEVE_CORE
 +       select NET_IP_TUNNEL
 +       ---help---
 +        This allows one to create geneve virtual interfaces that provide
 +        Layer 2 Networks over Layer 3 Networks. GENEVE is often used
 +        to tunnel virtual network infrastructure in virtualized environments.
 +        For more information see:
 +          http://tools.ietf.org/html/draft-gross-geneve-02
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called geneve.
 +
  config NETCONSOLE
        tristate "Network console logging support"
        ---help---
@@@ -217,8 -203,8 +217,8 @@@ config NET_POLL_CONTROLLE
        def_bool NETPOLL
  
  config NTB_NETDEV
-       tristate "Virtual Ethernet over NTB"
-       depends on NTB
+       tristate "Virtual Ethernet over NTB Transport"
+       depends on NTB_TRANSPORT
  
  config RIONET
        tristate "RapidIO Ethernet over messaging driver support"
@@@ -258,20 -244,6 +258,20 @@@ config TU
  
          If you don't know what to use this for, you don't need it.
  
 +config TUN_VNET_CROSS_LE
 +      bool "Support for cross-endian vnet headers on little-endian kernels"
 +      default n
 +      ---help---
 +        This option allows TUN/TAP and MACVTAP device drivers in a
 +        little-endian kernel to parse vnet headers that come from a
 +        big-endian legacy virtio device.
 +
 +        Userspace programs can control the feature using the TUNSETVNETBE
 +        and TUNGETVNETBE ioctls.
 +
 +        Unless you have a little-endian system hosting a big-endian virtual
 +        machine with a legacy virtio NIC, you should say N.
 +
  config VETH
        tristate "Virtual ethernet pair device"
        ---help---