diff options
author | Maxime Ripard <mripard@kernel.org> | 2024-12-02 12:44:18 +0100 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2024-12-02 12:44:18 +0100 |
commit | 3aba2eba84e0219fb66061359052be81bd883d53 (patch) | |
tree | 36da31539acaa6c360d0b606103d90926ac04e50 /drivers/nvdimm/pfn_devs.c | |
parent | 44cff6c5b0b17a78bc0b30372bcd816cf6dd282a (diff) | |
parent | 40384c840ea1944d7c5a392e8975ed088ecf0b37 (diff) |
Merge drm/drm-next into drm-misc-nextHEADdrm-misc-next
Kickstart 6.14 cycle.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/nvdimm/pfn_devs.c')
-rw-r--r-- | drivers/nvdimm/pfn_devs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c index 586348125b61..cfdfe0eaa512 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c @@ -539,7 +539,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) if (!nd_pfn->uuid) { /* - * When probing a namepace via nd_pfn_probe() the uuid + * When probing a namespace via nd_pfn_probe() the uuid * is NULL (see: nd_pfn_devinit()) we init settings from * pfn_sb */ |