Merge tag 'vfio-v4.12-rc1' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 May 2017 18:53:24 +0000 (11:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 May 2017 18:53:24 +0000 (11:53 -0700)
commitc336bf8e658122eeab63afe0bfcb6360a381a79c
treefb394cb3050fcd64b72508847dca181c7eafc943
parenta96480723c287c502b02659f4b347aecaa651ea1
parent7cb671e7a34d73b29df77d0b53492277744e57e7
Merge tag 'vfio-v4.12-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - Updates for SPAPR IOMMU backend including compatibility test and
   memory allocation check (Alexey Kardashevskiy)

 - Updates for type1 IOMMU backend to remove asynchronous locked page
   accounting and remove redundancy (Alex Williamson)

* tag 'vfio-v4.12-rc1' of git://github.com/awilliam/linux-vfio:
  vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote()
  vfio/type1: Prune vfio_pin_page_external()
  vfio/type1: Remove locked page accounting workqueue
  vfio/spapr_tce: Check kzalloc() return when preregistering memory
  vfio/powerpc/spapr_tce: Enforce IOMMU type compatibility check