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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0e10d8b c4d7f40)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 17 Jan 2022 22:01:15 +0000 (09:01 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 17 Jan 2022 22:01:15 +0000 (09:01 +1100)
commit	7a91a81a651c26890730cdabd36cc73f1c542100
tree	a1becac1b26bbaa0f0e735aad230034c6e13c2ef	tree
parent	0e10d8ba146c4c12183f391691cbc6f17e1df1c7	commit \| diff
parent	c4d7f40b250c1a4d74ed259e84807f58032507b6	commit \| diff

Merge branch 'for-next' of git://git./linux/kernel/git/masahiroy/linux-kbuild.git

# Conflicts:
# scripts/link-vmlinux.sh

16 files changed:

Documentation/process/changes.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/mips/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/parisc/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/slab.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
scripts/Makefile	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	diff1 \|	diff2 \|	blob \| history
scripts/link-vmlinux.sh	diff1 \|	diff2 \|	blob \| history
scripts/remove-stale-files	diff1 \|	diff2 \|	blob \| history

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