From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jan 2016 21:01:01 +0000 (-0800)
Subject: Merge tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v4.14-rc1~4006
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37cea93b99d2d89bef3adcb4632d71e1f377c447;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - Fixes in AMD xgbe reset, spapr structure padding, type 1 flags (Dan
   Carpenter, Alexey Kardashevskiy, Pierre Morel)

 - Re-introduce no-iommu mode, with a user this time (Alex Williamson)

* tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio:
  vfio/iommu_type1: make use of info.flags
  vfio: Include No-IOMMU mode
  vfio: Add explicit alignments in vfio_iommu_spapr_tce_create
  VFIO: platform: reset: fix a warning message condition
---

37cea93b99d2d89bef3adcb4632d71e1f377c447