]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorWill Deacon <will@kernel.org>
Mon, 23 Nov 2020 10:46:43 +0000 (10:46 +0000)
committerWill Deacon <will@kernel.org>
Mon, 23 Nov 2020 10:46:43 +0000 (10:46 +0000)
commitefdffe53e0aa59437206684845d9dff1b4889d9c
tree0692cb2c5ec1680cdba027f5f45be4485beca60c
parent0d2dc56595da1905f8846a14ab1c0011a469e1b8
parent133e9919112f3e3fe1d49ee0d39b6b6bf7fdbb00
Merge branch 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/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"
drivers/iommu/intel/iommu.c