From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Sep 2019 18:05:49 +0000 (-0700)
Subject: Merge tag 'ntb-5.4' of git://github.com/jonmason/ntb
X-Git-Tag: microblaze-v5.5-rc1~62
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=0cd81d77d0569f1dc1e39abeea93c6184e9b5b54

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

Pull NTB updates from Jon Mason:
 "A few bugfixes and support for new AMD NTB hardware"

* tag 'ntb-5.4' of git://github.com/jonmason/ntb:
  NTB: fix IDT Kconfig typos/spellos
  ntb_hw_amd: Add memory window support for new AMD hardware
  ntb_hw_amd: Add a new NTB PCI device ID
  NTB: ntb_transport: remove redundant assignment to rc
  ntb_hw_switchtec: make ntb_mw_set_trans() work when addr == 0
  ntb: point to right memory window index
---

0cd81d77d0569f1dc1e39abeea93c6184e9b5b54