Merge branch 'stable/for-jens-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@fb.com>
Mon, 27 Jul 2015 17:58:41 +0000 (11:58 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 27 Jul 2015 17:58:41 +0000 (11:58 -0600)
commite162b219ae6a64be353f254bd4ba1c9627c67749
treeec048447cd9a28f5a4a73b8f2ea76289acdbf8d7
parentcbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f
parent53bc7dc004fecf39e0ba70f2f8d120a1444315d3
Merge branch 'stable/for-jens-4.2' of git://git./linux/kernel/git/konrad/xen into for-linus

Konrad writes:

"There are three bugs that have been found in the xen-blkfront (and
backend). Two of them have the stable tree CC-ed. They have been found
where an guest is migrating to a host that is missing
'feature-persistent' support (from one that has it enabled). We end up
hitting an BUG() in the driver code."
drivers/block/xen-blkback/blkback.c
drivers/block/xen-blkfront.c