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

1 files changed, 6 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fc1718500181..8f3f93c9571e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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