Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2015 17:20:00 +0000 (10:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2015 17:20:00 +0000 (10:20 -0700)
Pull vhost fixes from Michael Tsirkin:
 "Two bugfixes only here"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: fix error handling for memory region alloc
  vhost: actually track log eventfd file


Trivial merge