From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Apr 2022 23:06:56 +0000 (-0700)
Subject: Merge tag 'vfio-v5.18-rc3' of https://github.com/awilliam/linux-vfio
X-Git-Tag: v6.1-rc5~1557
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38a5e3fb17e542dd86078eeb43029bf8f146a884;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'vfio-v5.18-rc3' of https://github.com/awilliam/linux-vfio

Pull vfio fix from Alex Williamson:

 - Fix VF token checking for vfio-pci variant drivers (Jason Gunthorpe)

* tag 'vfio-v5.18-rc3' of https://github.com/awilliam/linux-vfio:
  vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used
---

38a5e3fb17e542dd86078eeb43029bf8f146a884