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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d2b13a4 e70f36e)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 02:22:37 +0000 (13:22 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 02:22:37 +0000 (13:22 +1100)
commit	2d6b1799f26e4a65611986482f9cb0f9420a62f1
tree	b1add02dd7d72d473e258b3838a1158e4a2b4e8b	tree
parent	d2b13a443766f50d4944032aeb81fdc96b83b8d8	commit \| diff
parent	e70f36e84f9b736afa9b7b5a51e6ed5ca1de1803	commit \| diff

Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

# Conflicts:
# fs/iomap/direct-io.c

12 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/m68k/bvme6000/config.c	diff1 \|	diff2 \|	blob \| history
arch/m68k/kernel/setup_mm.c	diff1 \|	diff2 \|	blob \| history
arch/m68k/mvme147/config.c	diff1 \|	diff2 \|	blob \| history
arch/m68k/mvme16x/config.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/data.c	diff1 \|	diff2 \|	blob \| history
fs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/iomap/direct-io.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/power/hibernate.c	diff1 \|	diff2 \|	blob \| history

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