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)
commite61750c84701310f5a99e1c2e59d77aad5f1da78
tree8aeba4edb4e17b7752fa9218e584be46b93f2c97
parentaaeee62c841cc1e48231e1d60c304d2da9c4e41c
parent4a8c31a1c6f526ec96a35e613f2a71e26ffbd7dd
Merge branch 'stable/for-jens-5.1' of git://git./linux/kernel/git/konrad/xen into for-5.1/block-post

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