]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd39d3bc81c23b3e15e819afbb30db57f12fe8b39
tree8aeba4edb4e17b7752fa9218e584be46b93f2c97
parent41076f3b12d3fb142819985db20a3a34df024d5e
parent5eac58a979e95d64535cf47a434e4f78838d141a
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()