| commit | a78b03bc7300e4f17b1e510884bea1095d92b17b | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Sun Nov 18 15:46:03 2018 -0700 |
| committer | Jens Axboe <axboe@kernel.dk> | Sun Nov 18 15:46:03 2018 -0700 |
| tree | 855f219806462da09c8021b27848c58713bb1807 | |
| parent | fce15a609f8f30cfacfaf684729add9582be780b [diff] | |
| parent | 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6 [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>