]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:23:26 +0000 (09:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:23:26 +0000 (09:23 +1000)
commitd80e17085156bc879a4436b4458bcc0b6f90d324
tree84a90e0449bb9f243e1e8b0f82fee430c86fe379
parent06cdd65e8c52b3e3fd220c50fea721d96f74d58d
parent5e115b419d2b931203f3531c4f284ae153cfa1ca
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
14 files changed:
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
arch/arm/include/asm/thread_info.h
arch/arm/kernel/asm-offsets.c
arch/arm/kernel/ptrace.c
arch/arm/kernel/signal.c
arch/arm64/boot/dts/freescale/imx8mm.dtsi
arch/arm64/boot/dts/freescale/imx8mn.dtsi
arch/arm64/boot/dts/qcom/sc7180.dtsi
drivers/bus/ti-sysc.c
drivers/firmware/Kconfig
drivers/firmware/Makefile
drivers/spi/spi-imx.c
include/uapi/linux/virtio_ids.h