diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-18 16:27:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-18 16:27:58 -0700 |
| commit | cfd96ad1389cd6045a3af05bd34b2e52b291e365 (patch) | |
| tree | 3b1e544b7b0df919046e3d0aa6c96bca61673086 /MAINTAINERS | |
| parent | 7849ce38717e64213bf9cbb166d1cda14e05143f (diff) | |
| parent | 86e411b6ec277dbb8ac1f1d855dc337181a62a29 (diff) | |
| download | linux-stable-cfd96ad1389cd6045a3af05bd34b2e52b291e365.tar.gz linux-stable-cfd96ad1389cd6045a3af05bd34b2e52b291e365.zip | |
Merge tag 'libnvdimm-for-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull nvdimm/dax updates from Alison Schofield:
- Fix a race condition and a couple of static analysis issues in BTT
- Use sysfs_emit() in preparation for removal of cpumap_print_to_pagebuf()
- Escalate a dev_dbg to dev_err in a resource conflict message
- MAINTAINER file updates
* tag 'libnvdimm-for-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
MAINTAINERS: nvdimm: Include maintainer profile
MAINTAINERS: Update address for Ira Weiny
MAINTAINERS: Add maintainer info for libnvdimm and DAX
nvdimm: Use sysfs_emit() for cpumask show callback
dax/bus: Upgrade resource conflict message to dev_err() in alloc_dax_region()
nvdimm/btt: Free arenas on btt_init() error paths
nvdimm/btt: Free arena sub-allocations on discover_arenas() error path
nvdimm/btt: Handle preemption in BTT lane acquisition
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3147a467d458..926a17df059e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4302,7 +4302,7 @@ M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> M: "Rafael J. Wysocki" <rafael@kernel.org> M: Danilo Krummrich <dakr@kernel.org> R: Dave Ertman <david.m.ertman@intel.com> -R: Ira Weiny <ira.weiny@intel.com> +R: Ira Weiny <iweiny@kernel.org> R: Leon Romanovsky <leon@kernel.org> L: driver-core@lists.linux.dev S: Supported @@ -6454,8 +6454,8 @@ M: Jonathan Cameron <jic23@kernel.org> M: Dave Jiang <dave.jiang@intel.com> M: Alison Schofield <alison.schofield@intel.com> M: Vishal Verma <vishal.l.verma@intel.com> -M: Ira Weiny <ira.weiny@intel.com> M: Dan Williams <djbw@kernel.org> +R: Ira Weiny <iweiny@kernel.org> L: linux-cxl@vger.kernel.org S: Maintained F: Documentation/driver-api/cxl @@ -7320,6 +7320,7 @@ DEVICE DIRECT ACCESS (DAX) M: Dan Williams <djbw@kernel.org> M: Vishal Verma <vishal.l.verma@intel.com> M: Dave Jiang <dave.jiang@intel.com> +M: Alison Schofield <alison.schofield@intel.com> L: nvdimm@lists.linux.dev L: linux-cxl@vger.kernel.org S: Supported @@ -14725,6 +14726,7 @@ LIBNVDIMM BTT: BLOCK TRANSLATION TABLE M: Vishal Verma <vishal.l.verma@intel.com> M: Dan Williams <djbw@kernel.org> M: Dave Jiang <dave.jiang@intel.com> +M: Alison Schofield <alison.schofield@intel.com> L: nvdimm@lists.linux.dev S: Supported Q: https://patchwork.kernel.org/project/linux-nvdimm/list/ @@ -14735,6 +14737,7 @@ LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER M: Dan Williams <djbw@kernel.org> M: Vishal Verma <vishal.l.verma@intel.com> M: Dave Jiang <dave.jiang@intel.com> +M: Alison Schofield <alison.schofield@intel.com> L: nvdimm@lists.linux.dev S: Supported Q: https://patchwork.kernel.org/project/linux-nvdimm/list/ @@ -14753,12 +14756,14 @@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM M: Dan Williams <djbw@kernel.org> M: Vishal Verma <vishal.l.verma@intel.com> M: Dave Jiang <dave.jiang@intel.com> -M: Ira Weiny <ira.weiny@intel.com> +M: Alison Schofield <alison.schofield@intel.com> +R: Ira Weiny <iweiny@kernel.org> L: nvdimm@lists.linux.dev S: Supported Q: https://patchwork.kernel.org/project/linux-nvdimm/list/ P: Documentation/nvdimm/maintainer-entry-profile.rst T: git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git +F: Documentation/nvdimm/maintainer-entry-profile.rst F: drivers/acpi/nfit/* F: drivers/nvdimm/* F: include/linux/libnvdimm.h |