]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccd36b4 f8ee34a)
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)
* 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()

1  2 
drivers/nvme/host/lightnvm.c patch | diff1 | diff2 | blob | history

diff --cc drivers/nvme/host/lightnvm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.