diff options
| author |  Dan Williams <dan.j.williams@intel.com>
| 2022-10-01 19:16:16 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com>
| 2022-10-01 19:16:16 -0700 |
| commit | 305a72efa791c826fe84768ca55e31adc4113ea8 (patch) | |
| tree | 35c72646ea4b81528d73d3d79650004abed3285b /drivers/nvdimm/namespace_devs.c | |
| parent | nvdimm/namespace: drop unneeded temporary variable in size_store() (diff) | |
| parent | ACPI: HMAT: Release platform device in case of platform_device_add_data() fails (diff) | |
| download | linux-305a72efa791c826fe84768ca55e31adc4113ea8.tar.gz linux-305a72efa791c826fe84768ca55e31adc4113ea8.tar.bz2 linux-305a72efa791c826fe84768ca55e31adc4113ea8.zip | |
Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next
Add v6.1 content on top of some straggling updates that missed v6.0.
Diffstat (limited to 'drivers/nvdimm/namespace_devs.c')
| -rw-r--r-- | drivers/nvdimm/namespace_devs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 0f863fda56e6..90eefa0ee64d 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -385,7 +385,7 @@ static resource_size_t init_dpa_allocation(struct nd_label_id *label_id, * * BLK-space is valid as long as it does not precede a PMEM * allocation in a given region. PMEM-space must be contiguous - * and adjacent to an existing existing allocation (if one + * and adjacent to an existing allocation (if one * exists). If reserving PMEM any space is valid. */ static void space_valid(struct nd_region *nd_region, struct nvdimm_drvdata *ndd, |