From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 May 2021 16:39:04 +0000 (-0700)
Subject: Merge tag 'for-linus-5.13b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~1111
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f44e58bb1905ada4910f26676d2ea22a35545276;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-5.13b-rc2-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:

 - two patches for error path fixes

 - a small series for fixing a regression with swiotlb with Xen on Arm

* tag 'for-linus-5.13b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/swiotlb: check if the swiotlb has already been initialized
  arm64: do not set SWIOTLB_NO_FORCE when swiotlb is required
  xen/arm: move xen_swiotlb_detect to arm/swiotlb-xen.h
  xen/unpopulated-alloc: fix error return code in fill_list()
  xen/gntdev: fix gntdev_mmap() error exit path
---

f44e58bb1905ada4910f26676d2ea22a35545276