From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 May 2017 18:53:24 +0000 (-0700)
Subject: Merge tag 'vfio-v4.12-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: MMI-PSA29.97-13-9~5687
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c336bf8e658122eeab63afe0bfcb6360a381a79c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

c336bf8e658122eeab63afe0bfcb6360a381a79c