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

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

Signed-off-by: Jens Axboe <axboe@fb.com>

28 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/blk-flush.c	diff1 \|	diff2 \|	blob \| history
block/blk-map.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-rq.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5-cache.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/admin-cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/device_handler/scsi_dh_alua.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/st.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/gc.c	diff1 \|	diff2 \|	blob \| history
fs/splice.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/nvme.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
lib/iov_iter.c	diff1 \|	diff2 \|	blob \| history

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/blk-flush.c	diff1 \|	diff2 \|	blob \| history
block/blk-map.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-rq.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5-cache.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/admin-cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/device_handler/scsi_dh_alua.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/st.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/gc.c	diff1 \|	diff2 \|	blob \| history
fs/splice.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/nvme.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
lib/iov_iter.c	diff1 \|	diff2 \|	blob \| history