Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Feb 2022 22:43:30 +0000 (09:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Feb 2022 22:43:30 +0000 (09:43 +1100)
commite5e8b60cd2620d2eacd61be476893da512150878
tree55e2abf175a44240ff092e8a52aee82b8838223a
parent972e26de6a8e220588be80d7b475b989b7758250
parented43eed0a6ace218a40a3f114673c6acc305ab7b
Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git

# Conflicts:
# arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/boot/compressed/Makefile
arch/arm/kernel/traps.c
arch/arm/mm/ioremap.c
drivers/irqchip/irq-nvic.c