From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Sep 2022 20:23:11 +0000 (-0700)
Subject: Merge tag 'for-linus-6.0-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.17~6668
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65eea2c060aee3bf6d27ea365360059fbd4eeff4;p=platform%2Fkernel%2Flinux-rpi.git

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

65eea2c060aee3bf6d27ea365360059fbd4eeff4