Merge tag 'for-linus-6.0-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Sep 2022 20:23:11 +0000 (13:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Sep 2022 20:23:11 +0000 (13:23 -0700)
commit65eea2c060aee3bf6d27ea365360059fbd4eeff4
tree93b494c085cba42af9668d77bc2f29bc58b7dcbf
parentf0c5f7ea81202e997f321d59bdd0c3f5c12ddea7
parente9ea0b30ada008f4e65933f449db6894832cb242
Merge tag 'for-linus-6.0-rc4-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:

 - a minor fix for the Xen grant driver

 - a small series fixing a recently introduced problem in the Xen
   blkfront/blkback drivers with negotiation of feature usage

* tag 'for-linus-6.0-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/grants: prevent integer overflow in gnttab_dma_alloc_pages()
  xen-blkfront: Cache feature_persistent value before advertisement
  xen-blkfront: Advertise feature-persistent as user requested
  xen-blkback: Advertise feature-persistent as user requested
drivers/block/xen-blkfront.c