Merge branch 'for-4.4/lightnvm' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2015 04:46:08 +0000 (20:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2015 04:46:08 +0000 (20:46 -0800)
commiteffa04cc5a31b3f12cda6025ab93460f1f0e454e
tree4abea24fe619c2f7250d373af014c9693f350100
parenta9aa31cdc2a7be4a70b0ea24a451dfeb00ce0024
parent5f436e5ef170e5d3301bf5777a3c7c048295db1c
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
MAINTAINERS
drivers/nvme/host/pci.c