From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 13 Apr 2021 15:16:25 +0000 (-0600)
Subject: Merge branch 'for-5.13/drivers' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d45024e744c3a6ba7fb1fc3cc4f9fa8617223da2;p=users%2Fjedix%2Flinux-maple.git

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()
---

d45024e744c3a6ba7fb1fc3cc4f9fa8617223da2