From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 May 2021 21:22:58 +0000 (-0700)
Subject: Merge tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a2de4bbddce3e98bd2444bb027dc84418a0066b1;p=linux.git

Merge tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio

Pull more VFIO updates from Alex Williamson:
 "A second small set of commits for this merge window, primarily to
  unbreak some deletions from our uAPI header.

   - Additional mdev sample driver cleanup (Dan Carpenter)

   - Doc fix (Alyssa Ross)

   - Unbreak uAPI from NVLink2 support removal (Alex Williamson)"

* tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio:
  docs: vfio: fix typo
  vfio/pci: Revert nvlink removal uAPI breakage
  vfio/mdev: remove unnecessary NULL check in mbochs_create()
---

a2de4bbddce3e98bd2444bb027dc84418a0066b1