Merge branch 'stable/for-jens-4.15' of git://git.kernel.org/pub/scm/linux/kernel...
authorJens Axboe <axboe@kernel.dk>
Thu, 8 Mar 2018 16:24:52 +0000 (09:24 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 8 Mar 2018 16:24:52 +0000 (09:24 -0700)
commit9296080a18d95bfe97d399e5ce4e0980293e6194
tree40fedf16c45aedde44b8e4c76a355646aef0dac5
parent86755b7a96faed57f910f9e6b8061e019ac1ec08
parent7ed8ce1c5fc7cf25b3602c73bef897a3466a6645
Merge branch 'stable/for-jens-4.15' of git://git./linux/kernel/git/konrad/xen into for-linus

Pull a xen_blkfront fix from Konrad:

"It has one simple fix for the multi-queue support not showing up after
a block device was detached/re-attached."

* 'stable/for-jens-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen-blkfront: move negotiate_mq to cover all cases of new VBDs
drivers/block/xen-blkfront.c