]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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"

1  2 
drivers/iommu/intel/iommu.c

Simple merge