| commit | e61750c84701310f5a99e1c2e59d77aad5f1da78 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Wed Mar 06 09:41:54 2019 -0700 |
| committer | Jens Axboe <axboe@kernel.dk> | Wed Mar 06 09:41:54 2019 -0700 |
| tree | 8aeba4edb4e17b7752fa9218e584be46b93f2c97 | |
| parent | aaeee62c841cc1e48231e1d60c304d2da9c4e41c [diff] | |
| parent | 4a8c31a1c6f526ec96a35e613f2a71e26ffbd7dd [diff] |
Merge branch 'stable/for-jens-5.1' of git://git.kernel.org/pub/scm/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()