From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Sep 2021 20:05:02 +0000 (-0700)
Subject: Merge tag 'ntb-5.15' of git://github.com/jonmason/ntb
X-Git-Tag: microblaze-v5.16~68
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=1735715e0fd7a16972402ac98197e6cf30988a45

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

Pull NTB updates from Jon Mason:
 "Bug fixes and clean-ups for Linux v5.15"

* tag 'ntb-5.15' of git://github.com/jonmason/ntb:
  NTB: switch from 'pci_' to 'dma_' API
  ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data
  NTB: perf: Fix an error code in perf_setup_inbuf()
  NTB: Fix an error code in ntb_msit_probe()
  ntb: intel: remove invalid email address in header comment
---

1735715e0fd7a16972402ac98197e6cf30988a45