From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 6 Mar 2019 16:41:54 +0000 (-0700)
Subject: Merge branch 'stable/for-jens-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e61750c84701310f5a99e1c2e59d77aad5f1da78;p=openwrt%2Fstaging%2Fblogic.git

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

e61750c84701310f5a99e1c2e59d77aad5f1da78