From: Jens Axboe <axboe@fb.com>
Date: Thu, 9 Jun 2016 15:49:55 +0000 (-0600)
Subject: Merge branch 'stable/for-jens-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~2012^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1decabc1a70b97ef7412224df3dcb59d1227e3af;p=linux-4.9.git

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).
---

1decabc1a70b97ef7412224df3dcb59d1227e3af