Merge branch 'stable/for-jens-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@fb.com>
Thu, 9 Jun 2016 15:49:55 +0000 (09:49 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 9 Jun 2016 15:49:55 +0000 (09:49 -0600)
commit1decabc1a70b97ef7412224df3dcb59d1227e3af
tree3e235b7bc0b1a2edc027f90b8cab5c1a590728a8
parentd366a0ff1cf73f93796f2377e7b0361a94c41c35
parent2a6f71ad99cabe436e70c3f5fcf58072cb3bc07f
Merge branch 'stable/for-jens-4.7' of git://git./linux/kernel/git/konrad/xen into for-linus

Konrad writes:

Thishas two fixes for a guest migrating from host that
has multi-queue to one without it (and vice-versa).