Merge tag 'vfio-v5.0-rc2' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jan 2019 17:20:46 +0000 (09:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jan 2019 17:20:46 +0000 (09:20 -0800)
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


Trivial merge