From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Aug 2020 04:04:35 +0000 (-0700)
Subject: Merge tag 'vfio-v5.9-rc2' of git://github.com/awilliam/linux-vfio
X-Git-Tag: Ubuntu-5.13.0-19.19~5230
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7eac66d0456fe12a462e5c14c68e97c7460989da;p=mirror_ubuntu-jammy-kernel.git

Merge tag 'vfio-v5.9-rc2' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - Fix lockdep issue reported for recursive read-lock (Alex Williamson)

 - Fix missing unwind in type1 replay function (Alex Williamson)

* tag 'vfio-v5.9-rc2' of git://github.com/awilliam/linux-vfio:
  vfio/type1: Add proper error unwind for vfio_iommu_replay()
  vfio-pci: Avoid recursive read-lock usage
---

7eac66d0456fe12a462e5c14c68e97c7460989da