Merge branch 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2020 22:15:06 +0000 (14:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2020 22:15:06 +0000 (14:15 -0800)
commit3d5e28bff7ad55aea081c1af516cc1c94a5eca7d
tree4c2e8b419328077f1d7319e691252ed2605ed655
parenteccc876724927ff3b9ff91f36f7b6b159e948f0c
parentfc0021aa340af65a0a37d77be39e22aa886a6132
Merge branch 'stable/for-linus-5.10-rc2' of git://git./linux/kernel/git/konrad/swiotlb

Pull swiotlb fixes from Konrad Rzeszutek Wilk:
 "Two tiny fixes for issues that make drivers under Xen unhappy under
  certain conditions"

* 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single
  swiotlb: fix "x86: Don't panic if can not alloc buffer for swiotlb"
drivers/iommu/intel/iommu.c