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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 03c2b7c a98e58e)

author	Jens Axboe <axboe@fb.com>
	Mon, 6 Feb 2017 16:44:26 +0000 (09:44 -0700)
committer	Jens Axboe <axboe@fb.com>
	Mon, 6 Feb 2017 16:44:26 +0000 (09:44 -0700)
commit	7733a09c395938a40417949056415eed795739d7
tree	557682193bdd7eeca7067fe04f7a649eb843393f	tree
parent	03c2b7c0112cf4e18d194b120c87f55c6a7bb096	commit \| diff
parent	a98e58e54fbd0c80b6a46a7cac6e231eed3b3efa	commit \| diff

Merge branch 'for-4.11/block' into for-next

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/Kconfig	diff1 \|	diff2 \|	blob \| history
block/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/nvme.h	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	diff1 \|	diff2 \|	blob \| history

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