diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-02-04 11:27:18 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-02-04 11:27:18 -0700 |
| commit | e960f71a3dfb44b777c96d231c622c724a7a755c (patch) | |
| tree | f21897d5dda9535b2011e41f928e205866438f49 /drivers/cdrom | |
| parent | bb94aea1444b9859faa8d72aff3713fcd11c6696 (diff) | |
| parent | 794a4cb3d2f7c105112f9b59525533f00ac06006 (diff) | |
| download | linux-stable-e960f71a3dfb44b777c96d231c622c724a7a755c.tar.gz linux-stable-e960f71a3dfb44b777c96d231c622c724a7a755c.tar.bz2 linux-stable-e960f71a3dfb44b777c96d231c622c724a7a755c.zip | |
Merge branch 'nvme-5.1' of git://git.infradead.org/nvme into for-5.1/block
Pull 5.1 NVMe material from Christoph:
"Below is our current (small) queue of NVMe patches for Linux 5.1. We
want the re-addition of the Write Zeroes support to be in linu-next for
a few weeks as it caused some problems last time. The only other patch
is a cleanup from Sagi."
* 'nvme-5.1' of git://git.infradead.org/nvme:
nvme: remove the .stop_ctrl callout
nvme: add support for the Write Zeroes command
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions