diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2018-08-05 19:32:09 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-08-05 19:32:09 -0600 |
| commit | 05b9ba4b550ff67d7362608828405f9e389e8988 (patch) | |
| tree | 12b0f4e41c1491fe5087480d9c47e61aff8a1d33 /drivers/nvdimm/bus.c | |
| parent | scsi: Check sense buffer size at build time (diff) | |
| parent | Linux 4.18-rc6 (diff) | |
| download | linux-dev-05b9ba4b550ff67d7362608828405f9e389e8988.tar.xz linux-dev-05b9ba4b550ff67d7362608828405f9e389e8988.zip | |
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>
Diffstat (limited to 'drivers/nvdimm/bus.c')
0 files changed, 0 insertions, 0 deletions