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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4d8a991 a2b9377)

author	Jens Axboe <axboe@kernel.dk>
	Fri, 30 Jun 2017 00:09:58 +0000 (18:09 -0600)
committer	Jens Axboe <axboe@kernel.dk>
	Fri, 30 Jun 2017 00:09:58 +0000 (18:09 -0600)
commit	166a00988549e9a5dfb341e2453385fca102b57d
tree	4a2d17d4b4cb5816d45a1a55dbfd8b523b0d1920	tree
parent	4d8a991d460d4fa4829beaffdcba45a217ca0fa7	commit \| diff
parent	a2b93775002bc12ff7a61c7d622de07f553f0d53	commit \| diff

Merge branch 'for-4.13/block' into for-4.13/merge

Signed-off-by: Jens Axboe <axboe@kernel.dk>

14 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/bio.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-integrity.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-io.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-thin.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-pci.c	diff1 \|	diff2 \|	blob \| history
fs/block_dev.c	diff1 \|	diff2 \|	blob \| history
fs/read_write.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_aops.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	diff1 \|	diff2 \|	blob \| history
include/linux/bio.h	diff1 \|	diff2 \|	blob \| history

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