Merge remote-tracking branch 'arm-soc/for-next'

# Conflicts:
#	arch/arm64/boot/dts/qcom/sc7280-idp.dts
#	arch/arm64/boot/dts/qcom/sc7280.dtsi
#	drivers/firmware/Makefile
#	include/uapi/linux/virtio_ids.h

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/asm/thread_info.h
index d89931aed59ff3cd4d603d61e8ad0c7edf547ecf,a02799bd0cdf575b7823f4f4636d478f89e47796..9a18da3e10cc3b776c2e8ad06f4fa43ed0a9edeb
--- 1/arch/arm/include/asm/thread_info.h
--- 2/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@@ -59,12 -62,9 +59,9 @@@ struct thread_info 
        unsigned long           stack_canary;
  #endif
        struct cpu_context_save cpu_context;    /* cpu context */
 -      __u32                   syscall;        /* syscall number */
 +      __u32                   abi_syscall;    /* ABI type and syscall nr */
        __u8                    used_cp[16];    /* thread used copro */
        unsigned long           tp_value[2];    /* TLS registers */
- #ifdef CONFIG_CRUNCH
-       struct crunch_state     crunchstate;
- #endif
        union fp_state          fpstate __attribute__((aligned(8)));
        union vfp_state         vfpstate;
  #ifdef CONFIG_ARM_THUMBEE

diff --cc arch/arm/kernel/asm-offsets.c
Simple merge

diff --cc arch/arm/kernel/ptrace.c
Simple merge

diff --cc arch/arm/kernel/signal.c
Simple merge

diff --cc arch/arm64/boot/dts/freescale/imx8mm.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/freescale/imx8mn.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sc7180.dtsi
Simple merge

diff --cc drivers/bus/ti-sysc.c
Simple merge

diff --cc drivers/firmware/Kconfig
Simple merge

diff --cc drivers/firmware/Makefile
index 705fabe88156f2cfa8792b64015828a6f1f5bab3,3c2af2e98def81e9af5223c2042ce1d196bbcafe..5ced0673d94b560b41720dad069e7ff5ddfcae6e
--- 1/drivers/firmware/Makefile
--- 2/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@@ -17,9 -17,8 +17,10 @@@ obj-$(CONFIG_ISCSI_IBFT)     += iscsi_ibft.
  obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
  obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
  obj-$(CONFIG_FW_CFG_SYSFS)    += qemu_fw_cfg.o
- obj-$(CONFIG_QCOM_SCM)                += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o
+ obj-$(CONFIG_QCOM_SCM)                += qcom-scm.o
+ qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o
 +obj-$(CONFIG_SYSFB)           += sysfb.o
 +obj-$(CONFIG_SYSFB_SIMPLEFB)  += sysfb_simplefb.o
  obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o
  obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o
  obj-$(CONFIG_TURRIS_MOX_RWTM) += turris-mox-rwtm.o

diff --cc drivers/spi/spi-imx.c
Simple merge

diff --cc include/uapi/linux/virtio_ids.h
index 99aa27b100bc94d76894cf5de630e55040803f70,f74155f6882d82473db08944716f4ce84bedf6a0..6da2f80a85e85fc861f3487b05891396a5398db0
--- 1/include/uapi/linux/virtio_ids.h
--- 2/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@@ -55,7 -55,7 +55,8 @@@
  #define VIRTIO_ID_FS                  26 /* virtio filesystem */
  #define VIRTIO_ID_PMEM                        27 /* virtio pmem */
  #define VIRTIO_ID_MAC80211_HWSIM      29 /* virtio mac80211-hwsim */
+ #define VIRTIO_ID_SCMI                        32 /* virtio SCMI */
 +#define VIRTIO_ID_I2C_ADAPTER         34 /* virtio i2c adapter */
  #define VIRTIO_ID_BT                  40 /* virtio bluetooth */
  
  /*