projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fce15a6 9ff0119)
Merge tag 'v4.20-rc3' into for-4.21/block
authorJens Axboe <axboe@kernel.dk>
Sun, 18 Nov 2018 22:46:03 +0000 (15:46 -0700)
committerJens Axboe <axboe@kernel.dk>
Sun, 18 Nov 2018 22:46:03 +0000 (15:46 -0700)
commita78b03bc7300e4f17b1e510884bea1095d92b17b
tree855f219806462da09c8021b27848c58713bb1807tree | snapshot
parentfce15a609f8f30cfacfaf684729add9582be780bcommit | diff
parent9ff01193a20d391e8dbce4403dd5ef87c7eaaca6commit | diff
Merge tag 'v4.20-rc3' into for-4.21/block

Merge in -rc3 to resolve a few conflicts, but also to get a few
important fixes that have gone into mainline since the block
4.21 branch was forked off (most notably the SCSI queue issue,
which is both a conflict AND needed fix).

Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c diff1 | diff2 | blob | history
block/blk-merge.c diff1 | diff2 | blob | history
block/blk.h diff1 | diff2 | blob | history
drivers/block/floppy.c diff1 | diff2 | blob | history
drivers/nvme/host/core.c diff1 | diff2 | blob | history
drivers/nvme/host/multipath.c diff1 | diff2 | blob | history
drivers/scsi/Kconfig diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_os.c diff1 | diff2 | blob | history
drivers/scsi/scsi_lib.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git