Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos...

diff --cc drivers/base/dd.c
Simple merge

diff --cc drivers/base/power/main.c
index 2932a5bd892f7e2b400d5b806c7df36b3cdc30a8,e44944f4be77d0a573e4e46850849b52ba09a349,2932a5bd892f7e2b400d5b806c7df36b3cdc30a8,e44944f4be77d0a573e4e46850849b52ba09a349,2932a5bd892f7e2b400d5b806c7df36b3cdc30a8,e44944f4be77d0a573e4e46850849b52ba09a349,04bcb11ed8de7bf84eb935a850ae0a457320ee0e..252095e751ae1b653cb31cc5b00dba6c11ae3ad6
--- 1/drivers/base/power/main.c
--- 2/drivers/base/power/main.c
--- 3/drivers/base/power/main.c
--- 4/drivers/base/power/main.c
--- 5/drivers/base/power/main.c
--- 6/drivers/base/power/main.c
--- 7/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@@@@@@ -1040,6 -1038,8 -1040,6 -1038,8 -1040,6 -1038,8 -1096,8 +1098,8 @@@@@@@@ static int __device_suspend_noirq(struc
        if (dev->power.syscore || dev->power.direct_complete)
                goto Complete;
       
 - - -  dpm_wait_for_children(dev, async);
++++++  dpm_wait_for_subordinate(dev, async);
+ + +  
        if (dev->pm_domain) {
                info = "noirq power domain ";
                callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@@@@@@@ -1187,6 -1185,8 -1187,6 -1185,8 -1187,6 -1185,8 -1243,8 +1247,8 @@@@@@@@ static int __device_suspend_late(struc
        if (dev->power.syscore || dev->power.direct_complete)
                goto Complete;
       
 - - -  dpm_wait_for_children(dev, async);
++++++  dpm_wait_for_subordinate(dev, async);
+ + +  
        if (dev->pm_domain) {
                info = "late power domain ";
                callback = pm_late_early_op(&dev->pm_domain->ops, state);

diff --cc drivers/iommu/arm-smmu.c
index 8f7281444551dfc8a7b1a1bbfdb66a81f28e01ca,c841eb7a1a7417af301e6c51a9ba464d05b1472a,41b67ce999bf917e08434e1befbe6c86acaf6c55,c841eb7a1a7417af301e6c51a9ba464d05b1472a,8f7281444551dfc8a7b1a1bbfdb66a81f28e01ca,b85fa2471738f8c506e882540c177a8ae414d9f0,c841eb7a1a7417af301e6c51a9ba464d05b1472a..a60cded8a6eddf445dcb1e2b0177999c207c8a74
--- 1/drivers/iommu/arm-smmu.c
--- 2/drivers/iommu/arm-smmu.c
--- 3/drivers/iommu/arm-smmu.c
--- 4/drivers/iommu/arm-smmu.c
--- 5/drivers/iommu/arm-smmu.c
--- 6/drivers/iommu/arm-smmu.c
--- 7/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@@@@@@@ -1402,8 -1390,8 -1406,8 -1390,8 -1402,8 -1390,8 -1390,8 +1406,8 @@@@@@@@ static int arm_smmu_add_device(struct d
                fwspec = dev->iommu_fwspec;
                if (ret)
                        goto out_free;
 - - -- } else if (fwspec) {
 - - --         smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode));
 + + ++ } else if (fwspec && fwspec->ops == &arm_smmu_ops) {
-   -           smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode));
++ ++++         smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
        } else {
                return -ENODEV;
        }

diff --cc drivers/iommu/iommu.c
Simple merge

diff --cc drivers/iommu/mtk_iommu.c
Simple merge

diff --cc drivers/iommu/mtk_iommu_v1.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc include/linux/iommu.h
Simple merge