Merge branch 'stable/for-jens-4.13' of git://git.kernel.org/pub/scm/linux/kernel...
authorJens Axboe <axboe@kernel.dk>
Wed, 16 Aug 2017 15:56:34 +0000 (09:56 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 16 Aug 2017 15:56:34 +0000 (09:56 -0600)
commit3e09fc802d05695393a48f6c2d888771b80c4301
tree91ca26e7faf70ac11bd6c90cb5058a4e67a0aa49
parent3280d66a6363af0df0441709bc0bc302bd9a2510
parentb15bd8cb37598afb2963f7eb9e2de468d2d60a2f
Merge branch 'stable/for-jens-4.13' of git://git./linux/kernel/git/konrad/xen into for-linus

Pull xen block changes from Konrad:

Two fixes, both of them spotted by Amazon:

 1) Fix in Xen-blkfront caused by the re-write in 4.8 time-frame.
 2) Fix in the xen_biovec_phys_mergeable which allowed guest
    requests when using NVMe - to slurp up more data than allowed
    leading to an XSA (which has been made public today).