projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e4298b b562e44)
Merge tag 'v4.5' into for-4.6/drivers-merged
authorJens Axboe <axboe@fb.com>
Tue, 15 Mar 2016 22:56:24 +0000 (15:56 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 15 Mar 2016 22:56:24 +0000 (15:56 -0700)
commit83a34c1b9c4a8ab35c18d9c7e950bf6470ed31fe
tree01423f26a61fc7e01f78ba72d6046a7d19d12e67tree
parent5e4298be45e83ecdffaabb370eea9396889b07f1commit | diff
parentb562e44f507e863c6792946e4e1b1449fbbac85dcommit | diff
Merge tag 'v4.5' into for-4.6/drivers-merged

Resolve conflicts between fixes added to NVMe after for-4.6/drivers
was forked off. Mostly straight forward, but we needed an export
of nvme_kill_queues() as well.

Signed-off-by: Jens Axboe <axboe@fb.com>
12 files changed:
MAINTAINERS diff1 | diff2 | blob | history
block/blk-mq.c diff1 | diff2 | blob | history
drivers/block/xen-blkfront.c diff1 | diff2 | blob | history
drivers/lightnvm/core.c diff1 | diff2 | blob | history
drivers/lightnvm/rrpc.c diff1 | diff2 | blob | history
drivers/lightnvm/rrpc.h diff1 | diff2 | blob | history
drivers/nvme/host/Kconfig diff1 | diff2 | blob | history
drivers/nvme/host/core.c diff1 | diff2 | blob | history
drivers/nvme/host/lightnvm.c diff1 | diff2 | blob | history
drivers/nvme/host/nvme.h diff1 | diff2 | blob | history
drivers/nvme/host/pci.c diff1 | diff2 | blob | history
include/linux/lightnvm.h diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)