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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a35d483 a102cd3)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 17 Feb 2022 01:04:36 +0000 (12:04 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 17 Feb 2022 01:04:36 +0000 (12:04 +1100)
commit	b2170e3b7f774ca35bd3d892e86f279b9718f708
tree	1c4072d1d9d152d4d045bb483c3e40a983c858e6	tree
parent	a35d48327d72a0e2548a76958225352db82e2266	commit \| diff
parent	a102cd383c4a83342f8dbb1abab60b279cf5ae0d	commit \| diff

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

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

13 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
drivers/block/loop.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/io_uring.c	diff1 \|	diff2 \|	blob \| history
fs/iomap/direct-io.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_policy.c	diff1 \|	diff2 \|	blob \| history

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