git.kernel.dk Git - linux-2.6-block.git/commit

author	Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
	Mon, 31 Jan 2022 15:42:41 +0000 (15:42 +0000)
committer	Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
	Mon, 31 Jan 2022 15:42:41 +0000 (15:42 +0000)
commit	ed43eed0a6ace218a40a3f114673c6acc305ab7b
tree	4652ae1964230aa0c3609fad84822e6a2d5cb536	tree
parent	c8469eb986269ddce527cdcab4d894a1d45cfb4d	commit \| diff
parent	2fa3948244939471bfc93fa2f7cf3a1aadf79822	commit \| diff

Merge branch 'devel-stable' into for-next

# Conflicts:
# arch/arm/include/asm/switch_to.h
# arch/arm/kernel/traps.c

Linux 6.x block layer and io_uring tree(s)

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/assembler.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/switch_to.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-armv.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/traps.c	diff1 \|	diff2 \|	blob \| history