Merge remote-tracking branch 'korg/core' into x86/amd

author Joerg Roedel <jroedel@suse.de>

Mon, 2 Aug 2021 15:00:28 +0000 (17:00 +0200)

committer Joerg Roedel <jroedel@suse.de>

Mon, 2 Aug 2021 15:00:28 +0000 (17:00 +0200)
author Joerg Roedel <jroedel@suse.de>
Mon, 2 Aug 2021 15:00:28 +0000 (17:00 +0200)
committer Joerg Roedel <jroedel@suse.de>
Mon, 2 Aug 2021 15:00:28 +0000 (17:00 +0200)
diff --cc drivers/iommu/amd/init.c
Simple merge
diff --cc drivers/iommu/amd/iommu.c
Simple merge
diff --cc include/linux/iommu.h
Simple merge
author	Joerg Roedel <jroedel@suse.de>
	Mon, 2 Aug 2021 15:00:28 +0000 (17:00 +0200)
committer	Joerg Roedel <jroedel@suse.de>
	Mon, 2 Aug 2021 15:00:28 +0000 (17:00 +0200)
		1	2
drivers/iommu/amd/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iommu/amd/iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/iommu.h	patch \|	diff1 \|	diff2 \|	blob \| history