Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y

author Dom Cobley <popcornmix@gmail.com>

Fri, 9 Jul 2021 17:12:44 +0000 (18:12 +0100)

committer Dom Cobley <popcornmix@gmail.com>

Fri, 9 Jul 2021 17:12:44 +0000 (18:12 +0100)
author Dom Cobley <popcornmix@gmail.com>
Fri, 9 Jul 2021 17:12:44 +0000 (18:12 +0100)
committer Dom Cobley <popcornmix@gmail.com>
Fri, 9 Jul 2021 17:12:44 +0000 (18:12 +0100)
diff --cc Makefile
Simple merge
diff --cc arch/arm/kernel/setup.c
Simple merge
diff --cc drivers/dma/Kconfig
Simple merge
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/net/usb/r8152.c
Simple merge
author	Dom Cobley <popcornmix@gmail.com>
	Fri, 9 Jul 2021 17:12:44 +0000 (18:12 +0100)
committer	Dom Cobley <popcornmix@gmail.com>
	Fri, 9 Jul 2021 17:12:44 +0000 (18:12 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	patch \|	diff1 \|	diff2 \|	blob \| history