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

Pull NTB (non-transparent bridge) updates from Jon Mason:
 "NTB driver bug fixes to address issues in NTB-RP enablement, spad,
  debugfs, and USD/DSD identification.

  Add a workaround on Xeon NTB devices for b2bdoorbell errata.  Also,
  add new NTB driver features to support 32bit x86, DMA engine support,
  and NTB-RP support.

  Finally, a few clean-ups and update to MAINTAINERS for the NTB git
  tree and wiki location"

* tag 'ntb-3.12' of git://github.com/jonmason/ntb:
  ntb: clean up unnecessary MSI/MSI-X capability find
  MAINTAINERS: Add Website and Git Tree for NTB
  NTB: Update Version
  NTB: Comment Fix
  NTB: Remove unused variable
  NTB: Remove References of non-B2B BWD HW
  NTB: NTB-RP support
  NTB: Rename Variables for NTB-RP
  NTB: Use DMA Engine to Transmit and Receive
  NTB: Enable 32bit Support
  NTB: Update Device IDs
  NTB: BWD Link Recovery
  NTB: Xeon Errata Workaround
  NTB: Correct debugfs to work with more than 1 NTB Device
  NTB: Correct USD/DSD Identification
  NTB: Correct Number of Scratch Pad Registers
  NTB: Add Error Handling in ntb_device_setup

diff --combined MAINTAINERS
index b6b29c3,0c81c44..99c6f35
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -580,24 -580,12 +580,24 @@@ L:      linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADV7511 DRIVER
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/adv7511*
 +
  ANALOG DEVICES INC ADV7604 DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/adv7604*
  
 +ANALOG DEVICES INC ADV7842 DRIVER
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/adv7842*
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  L:    device-drivers-devel@blackfin.uclinux.org
@@@ -607,7 -595,6 +607,7 @@@ S: Supporte
  F:    sound/soc/codecs/adau*
  F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ad1*
 +F:    sound/soc/codecs/ad7*
  F:    sound/soc/codecs/ssm*
  F:    sound/soc/codecs/sigmadsp.*
  
@@@ -651,12 -638,6 +651,12 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +APTINA CAMERA SENSOR PLL
 +M:    Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/aptina-pll.*
 +
  ARASAN COMPACT FLASH PATA CONTROLLER
  M:    Viresh Kumar <viresh.linux@gmail.com>
  L:    linux-ide@vger.kernel.org
@@@ -832,7 -813,7 +832,7 @@@ F: arch/arm/mach-prima2
  F:    drivers/dma/sirf-dma.c
  F:    drivers/i2c/busses/i2c-sirf.c
  F:    drivers/mmc/host/sdhci-sirf.c
 -F:    drivers/pinctrl/pinctrl-sirf.c
 +F:    drivers/pinctrl/sirf/
  F:    drivers/spi/spi-sirf.c
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -1320,6 -1301,7 +1320,6 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/vt8500_timer.c
 -F:    drivers/gpio/gpio-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
  F:    drivers/mmc/host/wmt-sdmmc.c
  F:    drivers/pwm/pwm-vt8500.c
@@@ -1565,13 -1547,6 +1565,13 @@@ W:    http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel*
  
 +ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
 +M:      Bradley Grove <linuxdrivers@attotech.com>
 +L:      linux-scsi@vger.kernel.org
 +W:      http://www.attotech.com
 +S:      Supported
 +F:      drivers/scsi/esas2r
 +
  AUDIT SUBSYSTEM
  M:    Al Viro <viro@zeniv.linux.org.uk>
  M:    Eric Paris <eparis@redhat.com>
@@@ -1848,12 -1823,6 +1848,12 @@@ L:    linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
 +BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 +M:    Eddie Wai <eddie.wai@broadcom.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/bnx2i/
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -2107,8 -2076,7 +2107,8 @@@ F:      drivers/usb/chipidea
  
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
 -M:    Roopa Prabhu <roprabhu@cisco.com>
 +M:    Sujith Sankar <ssujith@cisco.com>
 +M:    Govindarajulu Varadarajan <govindarajulu90@gmail.com>
  M:    Neel Patel <neepatel@cisco.com>
  M:    Nishank Trivedi <nistrive@cisco.com>
  S:    Supported
@@@ -2144,13 -2112,6 +2144,13 @@@ M:    Russell King <linux@arm.linux.org.uk
  S:    Maintained
  F:    include/linux/clk.h
  
 +CLOCKSOURCE, CLOCKEVENT DRIVERS
 +M:    Daniel Lezcano <daniel.lezcano@linaro.org>
 +M:    Thomas Gleixner <tglx@linutronix.de>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +S:    Supported
 +F:    drivers/clocksource
 +
  CISCO FCOE HBA DRIVER
  M:    Hiral Patel <hiralpat@cisco.com>
  M:    Suma Ramars <sramars@cisco.com>
@@@ -2493,9 -2454,9 +2493,9 @@@ S:      Maintaine
  F:    drivers/media/common/cypress_firmware*
  
  CYTTSP TOUCHSCREEN DRIVER
 -M:    Javier Martinez Canillas <javier@dowhile0.org>
 +M:    Ferruh Yigit <fery@cypress.com>
  L:    linux-input@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  F:    drivers/input/touchscreen/cyttsp*
  F:    include/linux/input/cyttsp.h
  
@@@ -4140,13 -4101,6 +4140,13 @@@ W:    http://launchpad.net/ideapad-lapto
  S:    Maintained
  F:    drivers/platform/x86/ideapad-laptop.c
  
 +IDEAPAD LAPTOP SLIDEBAR DRIVER
 +M:    Andrey Moiseev <o2g.org.ru@gmail.com>
 +L:    linux-input@vger.kernel.org
 +W:    https://github.com/o2genum/ideapad-slidebar
 +S:    Maintained
 +F:    drivers/input/misc/ideapad_slidebar.c
 +
  IDE/ATAPI DRIVERS
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-ide@vger.kernel.org
@@@ -4411,7 -4365,7 +4411,7 @@@ F:      drivers/net/wireless/iwlegacy
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <johannes.berg@intel.com>
 -M:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
 +M:    Emmanuel Grumbach <emmanuel.grumbach@intel.com>
  M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://intellinuxwireless.org
@@@ -5543,7 -5497,7 +5543,7 @@@ L:      platform-driver-x86@vger.kernel.or
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
 -MT9M032 SENSOR DRIVER
 +MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -5551,7 -5505,7 +5551,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9m032.c
  F:    include/media/mt9m032.h
  
 -MT9P031 SENSOR DRIVER
 +MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -5559,7 -5513,7 +5559,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/mt9p031.h
  
 -MT9T001 SENSOR DRIVER
 +MT9T001 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -5567,7 -5521,7 +5567,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9t001.c
  F:    include/media/mt9t001.h
  
 -MT9V032 SENSOR DRIVER
 +MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -5838,7 -5792,7 +5838,7 @@@ M:      Aloisio Almeida Jr <aloisio.almeida@
  M:    Samuel Ortiz <sameo@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
  L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 -S:    Maintained
 +S:    Supported
  F:    net/nfc/
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
@@@ -5889,6 -5843,8 +5889,8 @@@ F:      drivers/scsi/nsp32
  NTB DRIVER
  M:    Jon Mason <jon.mason@intel.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
@@@ -6321,13 -6277,6 +6323,13 @@@ F:    Documentation/PCI
  F:    drivers/pci/
  F:    include/linux/pci*
  
 +PCI DRIVER FOR NVIDIA TEGRA
 +M:    Thierry Reding <thierry.reding@gmail.com>
 +L:    linux-tegra@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 +F:    drivers/pci/host/pci-tegra.c
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -6729,11 -6678,11 +6731,11 @@@ F:   Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    Ravi Anand <ravi.anand@qlogic.com>
  M:    Vikas Chaudhary <vikas.chaudhary@qlogic.com>
  M:    iscsi-driver@qlogic.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
 +F:    Documentation/scsi/LICENSE.qla4xxx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
@@@ -6974,14 -6923,6 +6976,14 @@@ M:    Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/memstick/host/r592.*
  
 +ROCCAT DRIVERS
 +M:    Stefan Achatz <erazor_de@users.sourceforge.net>
 +W:    http://sourceforge.net/projects/roccat/
 +S:    Maintained
 +F:    drivers/hid/hid-roccat*
 +F:    include/linux/hid-roccat*
 +F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
 +
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
@@@ -7204,7 -7145,7 +7206,7 @@@ S:      Maintaine
  F:    include/linux/mmc/dw_mmc.h
  F:    drivers/mmc/host/dw_mmc*
  
 -TIMEKEEPING, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@@ -7217,6 -7158,7 +7219,6 @@@ F:      include/uapi/linux/timex.
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
 -F:    drivers/clocksource
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
@@@ -7296,7 -7238,6 +7298,7 @@@ W:      http://lksctp.sourceforge.ne
  S:    Maintained
  F:    Documentation/networking/sctp.txt
  F:    include/linux/sctp.h
 +F:    include/uapi/linux/sctp.h
  F:    include/net/sctp/
  F:    net/sctp/
  
@@@ -7736,17 -7677,6 +7738,17 @@@ F:    include/sound
  F:    include/uapi/sound/
  F:    sound/
  
 +SOUND - COMPRESSED AUDIO
 +M:    Vinod Koul <vinod.koul@intel.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 +S:    Supported
 +F:    Documentation/sound/alsa/compress_offload.txt
 +F:    include/sound/compress_driver.h
 +F:    include/uapi/sound/compress_*
 +F:    sound/core/compress_offload.c
 +F:    sound/soc/soc-compress.c
 +
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lgirdwood@gmail.com>
  M:    Mark Brown <broonie@kernel.org>
@@@ -7754,7 -7684,6 +7756,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
 +F:    Documentation/sound/alsa/soc/
  F:    sound/soc/
  F:    include/sound/soc*
  
@@@ -7963,11 -7892,11 +7965,11 @@@ S:   Maintaine
  F:    drivers/staging/nvec/
  
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 -M:    Andres Salomon <dilinger@queued.net>
 -M:    Chris Ball <cjb@laptop.org>
 +M:    Jens Frederich <jfrederich@gmail.com>
 +M:    Daniel Drake <dsd@laptop.org>
  M:    Jon Nettleton <jon.nettleton@gmail.com>
  W:    http://wiki.laptop.org/go/DCON
 -S:    Odd Fixes
 +S:    Maintained
  F:    drivers/staging/olpc_dcon/
  
  STAGING - OZMO DEVICES USB OVER WIFI DRIVER
@@@ -8045,12 -7974,6 +8047,12 @@@ F:    arch/m68k/sun3*
  F:    arch/m68k/include/asm/sun3*
  F:    drivers/net/ethernet/i825xx/sun3*
  
 +SUNDANCE NETWORK DRIVER
 +M:    Denis Kirjanov <kda@linux-powerpc.org>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/dlink/sundance.c
 +
  SUPERH
  M:    Paul Mundt <lethal@linux-sh.org>
  L:    linux-sh@vger.kernel.org
@@@ -8386,14 -8309,9 +8388,14 @@@ M:    Chris Metcalf <cmetcalf@tilera.com
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 -F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/net/ethernet/tile/
 +F:    drivers/char/tile-srom.c
  F:    drivers/edac/tile_edac.c
 +F:    drivers/net/ethernet/tile/
 +F:    drivers/rtc/rtc-tile.c
 +F:    drivers/tty/hvc/hvc_tile.c
 +F:    drivers/tty/serial/tilegx.c
 +F:    drivers/usb/host/*-tilegx.c
 +F:    include/linux/usb/tilegx.h
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <chessman@tux.org>
@@@ -8887,6 -8805,7 +8889,6 @@@ W:      http://www.linux-usb.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
  S:    Supported
  F:    Documentation/usb/
 -F:    drivers/net/usb/
  F:    drivers/usb/
  F:    include/linux/usb.h
  F:    include/linux/usb/
@@@ -9109,12 -9028,6 +9111,12 @@@ F:    drivers/staging/vme
  F:    drivers/vme/
  F:    include/linux/vme*
  
 +VMWARE HYPERVISOR INTERFACE
 +M:    Alok Kataria <akataria@vmware.com>
 +L:    virtualization@lists.linux-foundation.org
 +S:    Supported
 +F:    arch/x86/kernel/cpu/vmware.c
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <sbhatewara@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
@@@ -9336,9 -9249,9 +9338,9 @@@ F:      drivers/media/tuners/tuner-xc2028.
  
  XEN HYPERVISOR INTERFACE
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -M:    Jeremy Fitzhardinge <jeremy@goop.org>
 -L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 -L:    virtualization@lists.linux-foundation.org
 +M:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
 +M:    David Vrabel <david.vrabel@citrix.com>
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -9349,35 -9262,35 +9351,35 @@@ F:   include/uapi/xen
  
  XEN HYPERVISOR ARM
  M:    Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 -L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/xen/
  F:    arch/arm/include/asm/xen/
  
  XEN HYPERVISOR ARM64
  M:    Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 -L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/
  
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <ian.campbell@citrix.com>
 -L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*