diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 20:46:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 20:46:08 -0800 |
| commit | effa04cc5a31b3f12cda6025ab93460f1f0e454e (patch) | |
| tree | 4abea24fe619c2f7250d373af014c9693f350100 /drivers/nvme/host/Makefile | |
| parent | a9aa31cdc2a7be4a70b0ea24a451dfeb00ce0024 (diff) | |
| parent | 5f436e5ef170e5d3301bf5777a3c7c048295db1c (diff) | |
Merge branch 'for-4.4/lightnvm' of git://git.kernel.dk/linux-block
Pull lightnvm support from Jens Axboe:
"This adds support for lightnvm, and adds support to NVMe as well.
This is pretty exciting, in that it enables new and interesting use
cases for compatible flash devices. There's a LWN writeup about an
earlier posting here:
https://lwn.net/Articles/641247/
This has been underway for a while, and should be ready for merging at
this point"
* 'for-4.4/lightnvm' of git://git.kernel.dk/linux-block:
nvme: lightnvm: clean up a data type
lightnvm: refactor phys addrs type to u64
nvme: LightNVM support
rrpc: Round-robin sector target with cost-based gc
gennvm: Generic NVM manager
lightnvm: Support for Open-Channel SSDs
Diffstat (limited to 'drivers/nvme/host/Makefile')
| -rw-r--r-- | drivers/nvme/host/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile index cfb6679ec245..219dc206fa5f 100644 --- a/drivers/nvme/host/Makefile +++ b/drivers/nvme/host/Makefile @@ -1,4 +1,4 @@ obj-$(CONFIG_BLK_DEV_NVME) += nvme.o -nvme-y += pci.o scsi.o +nvme-y += pci.o scsi.o lightnvm.o |