From: Will Deacon <will@kernel.org>
Date: Mon, 23 Nov 2020 10:46:43 +0000 (+0000)
Subject: Merge branch 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.11-rc1~105^2~4^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=66930e7e1e58880046a0d39eacccf67e8027d980;p=linux-2.6-block.git

Merge branch 'stable/for-linus-5.10-rc2' of git://git./linux/kernel/git/konrad/swiotlb into for-next/iommu/vt-d

Merge swiotlb updates from Konrad, as we depend on the updated function
prototype for swiotlb_tbl_map_single(), which dropped the 'tbl_dma_addr'
argument in -rc4.

* '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"
---

66930e7e1e58880046a0d39eacccf67e8027d980