From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2017 01:35:43 +0000 (-0800)
Subject: Merge tag 'vfio-v4.10-rc4' of git://github.com/awilliam/linux-vfio
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af54efa4f5275b0594da50c68bfa8159a8cda0f5;p=linux-beck.git

Merge tag 'vfio-v4.10-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - Cleanups and bug fixes for the mtty sample driver (Dan Carpenter)

 - Export and make use of has_capability() to fix incorrect use of
   ns_capable() for testing task capabilities (Jike Song)

* tag 'vfio-v4.10-rc4' of git://github.com/awilliam/linux-vfio:
  vfio/type1: Remove pid_namespace.h include
  vfio iommu type1: fix the testing of capability for remote task
  capability: export has_capability
  vfio-mdev: remove some dead code
  vfio-mdev: buffer overflow in ioctl()
  vfio-mdev: return -EFAULT if copy_to_user() fails
---

af54efa4f5275b0594da50c68bfa8159a8cda0f5