From: Linus Torvalds Date: Wed, 23 Jun 2021 16:04:07 +0000 (-0700) Subject: Merge branch 'stable/for-linus-5.14' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.13~24 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/8fd2ed1c01dd96396c39dfa203c54705c6b6e03b Merge branch 'stable/for-linus-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb Pull swiotlb fix from Konrad Rzeszutek Wilk: "A fix for the regression for the DMA operations where the offset was ignored and corruptions would appear. Going forward there will be a cleanups to make the offset and alignment logic more clearer and better test-cases to help with this" * 'stable/for-linus-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: manipulate orig_addr when tlb_addr has offset --- 8fd2ed1c01dd96396c39dfa203c54705c6b6e03b