From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Jan 2016 00:00:52 +0000 (-0800)
Subject: Merge tag 'ntb-4.5' of git://github.com/jonmason/ntb
X-Git-Tag: Ubuntu-4.8.0-22.24~1971
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b3e27d5d4a29bcc8e057b496d5ef5194addaaac0;p=mirror_ubuntu-zesty-kernel.git

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
---

b3e27d5d4a29bcc8e057b496d5ef5194addaaac0