summary refs log tree commit diff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-05-16 09:39:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-16 09:39:04 -0700
commitf44e58bb1905ada4910f26676d2ea22a35545276 (patch)
treedbfe762a564dfedd003bd84521d918db6367c847 /arch/x86
parentccb013c29d2d16e37c9114b1cea19fac5643b173 (diff)
parent97729b653de52ba98e08732dd8855586e37a3a31 (diff)
downloadlinux-f44e58bb1905ada4910f26676d2ea22a35545276.tar.gz
Merge tag 'for-linus-5.13b-rc2-tag' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions