From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Apr 2019 01:07:28 +0000 (-1000)
Subject: Merge tag 'vfio-v5.1-rc4' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v5.4.17~3849
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3e28fb0fcb69dbedfe254939143198b46d83bfa1;p=arm%2Flinux.git

Merge tag 'vfio-v5.1-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - Fix clang printk format errors (Louis Taylor)

 - Declare structure static to fix sparse warning (Wang Hai)

 - Limit user DMA mappings per container (CVE-2019-3882) (Alex
   Williamson)

* tag 'vfio-v5.1-rc4' of git://github.com/awilliam/linux-vfio:
  vfio/type1: Limit DMA mappings per container
  vfio/spapr_tce: Make symbol 'tce_iommu_driver_ops' static
  vfio/pci: use correct format characters
---

3e28fb0fcb69dbedfe254939143198b46d83bfa1