aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS12
2 files changed, 7 insertions, 6 deletions
diff --git a/.mailmap b/.mailmap
index 29ddeb1bf015..fddb8c509e40 100644
--- a/.mailmap
+++ b/.mailmap
@@ -154,6 +154,7 @@ Ralf Wildenhues <[email protected]>
RĂ©mi Denis-Courmont <[email protected]>
Ricardo Ribalda Delgado <[email protected]>
Rudolf Marek <[email protected]>
Rui Saraiva <[email protected]>
Sachin P Sant <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 6cfd16790add..3d90f7ea09e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4269,7 +4269,7 @@ F: drivers/i2c/busses/i2c-diolan-u2c.c
FILESYSTEM DIRECT ACCESS (DAX)
M: Matthew Wilcox <[email protected]>
-M: Ross Zwisler <[email protected]>
+M: Ross Zwisler <[email protected]>
S: Supported
F: fs/dax.c
@@ -4279,7 +4279,7 @@ F: include/trace/events/fs_dax.h
DEVICE DIRECT ACCESS (DAX)
M: Dan Williams <[email protected]>
M: Dave Jiang <[email protected]>
-M: Ross Zwisler <[email protected]>
+M: Ross Zwisler <[email protected]>
M: Vishal Verma <[email protected]>
S: Supported
@@ -8142,7 +8142,7 @@ S: Maintained
F: tools/lib/lockdep/
LIBNVDIMM BLK: MMIO-APERTURE DRIVER
-M: Ross Zwisler <[email protected]>
+M: Ross Zwisler <[email protected]>
M: Dan Williams <[email protected]>
M: Vishal Verma <[email protected]>
M: Dave Jiang <[email protected]>
@@ -8155,7 +8155,7 @@ F: drivers/nvdimm/region_devs.c
LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
M: Vishal Verma <[email protected]>
M: Dan Williams <[email protected]>
-M: Ross Zwisler <[email protected]>
+M: Ross Zwisler <[email protected]>
M: Dave Jiang <[email protected]>
Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
@@ -8163,7 +8163,7 @@ S: Supported
F: drivers/nvdimm/btt*
LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
-M: Ross Zwisler <[email protected]>
+M: Ross Zwisler <[email protected]>
M: Dan Williams <[email protected]>
M: Vishal Verma <[email protected]>
M: Dave Jiang <[email protected]>
@@ -8182,7 +8182,7 @@ F: Documentation/devicetree/bindings/pmem/pmem-region.txt
LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
M: Dan Williams <[email protected]>
-M: Ross Zwisler <[email protected]>
+M: Ross Zwisler <[email protected]>
M: Vishal Verma <[email protected]>
M: Dave Jiang <[email protected]>