]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'for-5.13/drivers' into for-next
authorJens Axboe <axboe@kernel.dk>
Tue, 13 Apr 2021 15:16:25 +0000 (09:16 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 13 Apr 2021 15:16:25 +0000 (09:16 -0600)
commitd45024e744c3a6ba7fb1fc3cc4f9fa8617223da2
treed17dae0bae6803bf9282cdeb64221cec89fcc67f
parentccd36b4959b5720b02bef76f397bd4a503952c74
parentf8ee34a929a4adf6d29a7ef2145393e6865037ad
Merge branch 'for-5.13/drivers' into for-next

* for-5.13/drivers:
  lightnvm: deprecated OCSSD support and schedule it for removal in Linux 5.15
  lightnvm: remove duplicate include in lightnvm.h
  lightnvm: return the correct return value
  lightnvm: use kobj_to_dev()
drivers/nvme/host/lightnvm.c