diff options
| author | Will Deacon <will@kernel.org> | 2020-11-23 10:46:43 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-11-23 10:46:43 +0000 |
| commit | 66930e7e1e58880046a0d39eacccf67e8027d980 (patch) | |
| tree | 0692cb2c5ec1680cdba027f5f45be4485beca60c /drivers/counter | |
| parent | 68dd9d89eaf56dfab8d46bf25610aa4650247617 (diff) | |
| parent | fc0021aa340af65a0a37d77be39e22aa886a6132 (diff) | |
| download | lwn-66930e7e1e58880046a0d39eacccf67e8027d980.tar.gz lwn-66930e7e1e58880046a0d39eacccf67e8027d980.zip | |
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"
Diffstat (limited to 'drivers/counter')
0 files changed, 0 insertions, 0 deletions