diff options
| author | Linus Torvalds | 2021-05-15 08:32:51 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-05-15 08:32:51 -0700 |
| commit | a5ce4296b0416b3001c69abef7b5fa751c0f7578 (patch) | |
| tree | 6b2d606b6cf3301424fda44afbe184fd809ccfa8 /include | |
| parent | 393f42f113b607786207449dc3241d05ec61d5dc (diff) | |
| parent | e9cfd259c6d386f6235395a13bd4f357a979b2d0 (diff) | |
Merge tag 'libnvdimm-fixes-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams:
"A regression fix for a bootup crash condition introduced in this merge
window and some other minor fixups:
- Fix regression in ACPI NFIT table handling leading to crashes and
driver load failures.
- Move the nvdimm mailing list
- Miscellaneous minor fixups"
* tag 'libnvdimm-fixes-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
ACPI: NFIT: Fix support for variable 'SPA' structure size
MAINTAINERS: Move nvdimm mailing list
tools/testing/nvdimm: Make symbol '__nfit_test_ioremap' static
libnvdimm: Remove duplicate struct declaration
Diffstat (limited to 'include')
| -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); |