Merge branch 'stable/for-jens-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@kernel.dk>
Wed, 6 Mar 2019 16:41:54 +0000 (09:41 -0700)
committerJens Axboe <axboe@kernel.dk>
Wed, 6 Mar 2019 16:41:54 +0000 (09:41 -0700)
Pull two xen blkback fixes from Konrad.

* 'stable/for-jens-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/blkback: rework connect_ring() to avoid inconsistent xenstore 'ring-page-order' set by malicious blkfront
  xen/blkback: add stack variable 'blkif' in connect_ring()


Trivial merge