Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4c17252 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8de4651a 73f47cad
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -5889,6 +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
+1 −1
Original line number Diff line number Diff line
config NTB
       tristate "Intel Non-Transparent Bridge support"
       depends on PCI
       depends on X86_64
       depends on X86
       help
        The PCI-E Non-transparent bridge hardware is a point-to-point PCI-E bus
        connecting 2 systems.  When configured, writes to the device's PCI
Loading