From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Nov 2020 22:15:06 +0000 (-0800)
Subject: Merge branch 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: howlett/maple_spf/20210104~582
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3d5e28bff7ad55aea081c1af516cc1c94a5eca7d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/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"
---

3d5e28bff7ad55aea081c1af516cc1c94a5eca7d