git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Jens Axboe <axboe@kernel.dk>
	Mon, 12 Jun 2017 14:30:13 +0000 (08:30 -0600)
committer	Jens Axboe <axboe@kernel.dk>
	Mon, 12 Jun 2017 14:30:13 +0000 (08:30 -0600)
commit	8f66439eec46d652255b9351abebb540ee5b2fd9
tree	94f4a41dc343cf769cd92f1f7711e9ce8ad43728	tree \| snapshot
parent	22ec656bcc3f38207ad5476ebad1e5005fb0f1ff	commit \| diff
parent	32c1431eea4881a6b17bd7c639315010aeefa452	commit \| diff

Merge tag 'v4.12-rc5' into for-4.13/block

We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

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

27 files changed:

block/bio-integrity.c	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	diff1 \|	diff2 \|	blob \| history
block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
block/cfq-iosched.c	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	diff1 \|	diff2 \|	blob \| history
drivers/block/nbd.c	diff1 \|	diff2 \|	blob \| history
drivers/block/rbd.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-bufio.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-integrity.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-verity-target.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid10.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5-cache.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5-ppl.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/fc.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

block/bio-integrity.c	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	diff1 \|	diff2 \|	blob \| history
block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
block/cfq-iosched.c	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	diff1 \|	diff2 \|	blob \| history
drivers/block/nbd.c	diff1 \|	diff2 \|	blob \| history
drivers/block/rbd.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-bufio.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-integrity.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-verity-target.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid10.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5-cache.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5-ppl.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/fc.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history