From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Jan 2019 17:20:46 +0000 (-0800)
Subject: Merge tag 'vfio-v5.0-rc2' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1bdbe227492075d058e37cb3d400e6468d0095b5;p=linux.git

Merge tag 'vfio-v5.0-rc2' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - Fix trace header include path for in-tree builds (Masahiro Yamada)

 - Fix overflow in unmap wrap-around test (Alex Williamson)

* tag 'vfio-v5.0-rc2' of git://github.com/awilliam/linux-vfio:
  vfio/type1: Fix unmap overflow off-by-one
  vfio/pci: set TRACE_INCLUDE_PATH to fix the build error
---

1bdbe227492075d058e37cb3d400e6468d0095b5