diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2021-06-22 14:42:52 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-06-22 14:43:51 -0300 |
| commit | fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233 (patch) | |
| tree | e21b6d503468282cd9010d24b35327dc8d772980 /include/linux/libnvdimm.h | |
| parent | 6d33cabf2baf304730d01a942095416b3a8329ab (diff) | |
| parent | 13311e74253fe64329390df80bed3f07314ddd61 (diff) | |
| download | linux-next-fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233.tar.gz linux-next-fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233.zip | |
Merge tag 'v5.13-rc7' into rdma.git for-next
Linux 5.13-rc7
Needed for dependencies in following patches. Merge conflict in rxe_cmop.c
resolved by compining both patches.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'include/linux/libnvdimm.h')
| -rw-r--r-- | include/linux/libnvdimm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index 01f251b6e36c..89b69e645ac7 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -141,7 +141,6 @@ static inline void __iomem *devm_nvdimm_ioremap(struct device *dev, struct nvdimm_bus; struct module; -struct device; struct nd_blk_region; struct nd_blk_region_desc { int (*enable)(struct nvdimm_bus *nvdimm_bus, struct device *dev); |