| commit | 05b9ba4b550ff67d7362608828405f9e389e8988 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Sun Aug 05 19:32:09 2018 -0600 |
| committer | Jens Axboe <axboe@kernel.dk> | Sun Aug 05 19:32:09 2018 -0600 |
| tree | 12b0f4e41c1491fe5087480d9c47e61aff8a1d33 | |
| parent | 704f83928c8e7da6e06144569efb15dec73278e8 [diff] | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 [diff] |
Merge tag 'v4.18-rc6' into for-4.19/block2 Pull in 4.18-rc6 to get the NVMe core AEN change to avoid a merge conflict down the line. Signed-of-by: Jens Axboe <axboe@kernel.dk>