From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Feb 2020 22:22:05 +0000 (+0000)
Subject: Merge tag 'vfio-v5.6-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a6d5f9dca42eab3526e2f73aa5b7df2a5fec2c9d;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'vfio-v5.6-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - Fix nvlink error path (Alexey Kardashevskiy)

 - Update nvlink and spapr to use mmgrab() (Julia Lawall)

 - Update static declaration (Ben Dooks)

 - Annotate __iomem to fix sparse warnings (Ben Dooks)

* tag 'vfio-v5.6-rc1' of git://github.com/awilliam/linux-vfio:
  vfio: platform: fix __iomem in vfio_platform_amdxgbe.c
  vfio/mdev: make create attribute static
  vfio/spapr_tce: use mmgrab
  vfio: vfio_pci_nvlink2: use mmgrab
  vfio/spapr/nvlink2: Skip unpinning pages on error exit
---

a6d5f9dca42eab3526e2f73aa5b7df2a5fec2c9d