Merge tag 'for-linus-5.12b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2021 15:55:47 +0000 (08:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2021 15:55:47 +0000 (08:55 -0700)
commita080642d2f831cc34b68663c0db1c447d3807421
tree6fc9b8508e491f37e742c6bef4149dc65c50399f
parent1e43c377a79f9189fea8f2711b399d4e8b4e609b
parenta846738f8c3788d846ed1f587270d2f2e3d32432
Merge tag 'for-linus-5.12b-rc6-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "One Xen related security fix (XSA-371)"

* tag 'for-linus-5.12b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-blkback: don't leak persistent grants from xen_blkbk_map()
drivers/block/xen-blkback/blkback.c