From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Jan 2022 06:14:18 +0000 (+0200)
Subject: Merge tag 'ntb-5.17' of git://github.com/jonmason/ntb
X-Git-Tag: v6.1-rc5~2198
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96000bc956628dc0cc608696d5385ffc19e65a76;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull NTB updates from Jon Mason:
 "New AMD PCI ID for NTB, and a number of bug fixes for ntb_hw_switchtec
  for Linux v5.17"

* tag 'ntb-5.17' of git://github.com/jonmason/ntb:
  ntb_hw_switchtec: Fix a minor issue in config_req_id_table()
  ntb_hw_switchtec: Remove code for disabling ID protection
  ntb_hw_switchtec: Update the way of getting VEP instance ID
  ntb_hw_switchtec: AND with the part_map for a valid tpart_vec
  ntb_hw_switchtec: Fix bug with more than 32 partitions
  ntb_hw_switchtec: Fix pff ioread to read into mmio_part_cfg_all
  ntb_hw_switchtec: fix the spelling of "its"
  NTB/msi: Fix ntbm_msi_request_threaded_irq() kernel-doc comment
  ntb_hw_amd: Add NTB PCI ID for new gen CPU
---

96000bc956628dc0cc608696d5385ffc19e65a76