Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will...

diff --cc Documentation/arm64/silicon-errata.txt
Simple merge

diff --cc drivers/acpi/arm64/iort.c
index a46c2c162c03e85f15aa09b1388a80bd07e63272,2d70b349bd6c96ee8d586597c4c126c8ddd5b1a4..adbf7cbedf80d9a5719a3fcb34800ffd552bbecc
--- 1/drivers/acpi/arm64/iort.c
--- 2/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@@ -1324,8 -1395,9 +1401,9 @@@ struct iort_dev_config 
        int (*dev_count_resources)(struct acpi_iort_node *node);
        void (*dev_init_resources)(struct resource *res,
                                     struct acpi_iort_node *node);
 -      void (*dev_set_proximity)(struct device *dev,
 +      int (*dev_set_proximity)(struct device *dev,
                                    struct acpi_iort_node *node);
+       int (*dev_add_platdata)(struct platform_device *pdev);
  };
  
  static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = {