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)
commit1bdbe227492075d058e37cb3d400e6468d0095b5
treeb3a923c570040c4ecc3a4ba9bd41e5ef10a4a20b
parentf0ebbe9b18e0d2bb79c7963faf847b949d4f5720
parent58fec830fc19208354895d9832785505046d6c01
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