]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'swiotlb/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 00:40:19 +0000 (10:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 00:40:19 +0000 (10:40 +1000)
commit2cd89aa328f31617384651d9f65e78f2472740bb
tree22b29f993191fd925922a932d47302e2726f9838
parent71cccc94330ce015472291b1cfc6970715c088e7
parentf3c4b1341e8320e63f197a554fc5a25686a11d22
Merge remote-tracking branch 'swiotlb/linux-next'

# Conflicts:
# kernel/dma/direct.c
arch/s390/mm/init.c
drivers/base/core.c
drivers/gpu/drm/i915/gem/i915_gem_internal.c
drivers/iommu/dma-iommu.c
drivers/xen/swiotlb-xen.c
include/linux/device.h
kernel/dma/Kconfig
kernel/dma/direct.c