Merge tag 'for-linus-6.1-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Oct 2022 21:43:09 +0000 (14:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Oct 2022 21:43:09 +0000 (14:43 -0700)
commit1d61754caa8c69f566504e63c8b3f3a2df0954c8
tree742c3079be306565bbe9d41ddae275d9270233c2
parent0de0b76837c2e958ad0e8fa9abd9846843fbf3f8
parenta383dcb1cca8305497877119fba0a320f41fe853
Merge tag 'for-linus-6.1-rc2-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:
 "Just two fixes for the new 'virtio with grants' feature"

* tag 'for-linus-6.1-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/virtio: Convert PAGE_SIZE/PAGE_SHIFT/PFN_UP to Xen counterparts
  xen/virtio: Handle cases when page offset > PAGE_SIZE properly