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

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

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

Pull NTB updates from Jon Mason:
 "A new driver to support AMD NTB, a NTB performance test driver, NTB
  bugs fixes, and the ability to recover from running out of DMA
  descriptors"

* tag 'ntb-4.5' of git://github.com/jonmason/ntb:
  NTB: Fix macro parameter conflict with field name
  NTB: Add support for AMD PCI-Express Non-Transparent Bridge
  ntb: ntb perf tool
  NTB: Address out of DMA descriptor issue with NTB
  NTB: Clear property bits in BAR value
  NTB: ntb_process_tx error path bug
parents cc673757 03beaec8

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7702,6 +7702,12 @@ W: https://github.com/jonmason/ntb/wiki 
T:	git git://github.com/jonmason/ntb.git

F:	drivers/ntb/hw/intel/



NTB AMD DRIVER

M:	Xiangliang Yu <Xiangliang.Yu@amd.com>

L:	linux-ntb@googlegroups.com

S:	Supported

F:	drivers/ntb/hw/amd/



NTFS FILESYSTEM

M:	Anton Altaparmakov <anton@tuxera.com>

L:	linux-ntfs-dev@lists.sourceforge.net

drivers/ntb/hw/Kconfig

+1 −0
Original line number Diff line number Diff line 
source "drivers/ntb/hw/amd/Kconfig"

source "drivers/ntb/hw/intel/Kconfig"

drivers/ntb/hw/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_NTB_AMD)	+= amd/

obj-$(CONFIG_NTB_INTEL)	+= intel/

drivers/ntb/hw/amd/Kconfig

0 → 100644
+7 −0
Original line number Diff line number Diff line 
config NTB_AMD

	tristate "AMD Non-Transparent Bridge support"

	depends on X86_64

	help

	 This driver supports AMD NTB on capable Zeppelin hardware.



	 If unsure, say N.

drivers/ntb/hw/amd/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_NTB_AMD) += ntb_hw_amd.o