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 <Ralf.Wildenhues@gmx.de>
 Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
 Rémi Denis-Courmont <rdenis@simphalempin.com>
 Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
+Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
 Rudolf Marek <R.Marek@sh.cvut.cz>
 Rui Saraiva <rmps@joel.ist.utl.pt>
 Sachin P Sant <ssant@in.ibm.com>
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 <mawilcox@microsoft.com>
-M:      Ross Zwisler <ross.zwisler@linux.intel.com>
+M:      Ross Zwisler <zwisler@kernel.org>
 L:      linux-fsdevel@vger.kernel.org
 S:      Supported
 F:      fs/dax.c
@@ -4279,7 +4279,7 @@ F:	include/trace/events/fs_dax.h
 DEVICE DIRECT ACCESS (DAX)
 M:      Dan Williams <dan.j.williams@intel.com>
 M:      Dave Jiang <dave.jiang@intel.com>
-M:      Ross Zwisler <ross.zwisler@linux.intel.com>
+M:      Ross Zwisler <zwisler@kernel.org>
 M:      Vishal Verma <vishal.l.verma@intel.com>
 L:      linux-nvdimm@lists.01.org
 S:      Supported
@@ -8142,7 +8142,7 @@ S:	Maintained
 F:      tools/lib/lockdep/
 
 LIBNVDIMM BLK: MMIO-APERTURE DRIVER
-M:      Ross Zwisler <ross.zwisler@linux.intel.com>
+M:      Ross Zwisler <zwisler@kernel.org>
 M:      Dan Williams <dan.j.williams@intel.com>
 M:      Vishal Verma <vishal.l.verma@intel.com>
 M:      Dave Jiang <dave.jiang@intel.com>
@@ -8155,7 +8155,7 @@ F:	drivers/nvdimm/region_devs.c
 LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
 M:      Vishal Verma <vishal.l.verma@intel.com>
 M:      Dan Williams <dan.j.williams@intel.com>
-M:      Ross Zwisler <ross.zwisler@linux.intel.com>
+M:      Ross Zwisler <zwisler@kernel.org>
 M:      Dave Jiang <dave.jiang@intel.com>
 L:      linux-nvdimm@lists.01.org
 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 <ross.zwisler@linux.intel.com>
+M:      Ross Zwisler <zwisler@kernel.org>
 M:      Dan Williams <dan.j.williams@intel.com>
 M:      Vishal Verma <vishal.l.verma@intel.com>
 M:      Dave Jiang <dave.jiang@intel.com>
@@ -8182,7 +8182,7 @@ F:	Documentation/devicetree/bindings/pmem/pmem-region.txt
 
 LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 M:      Dan Williams <dan.j.williams@intel.com>
-M:      Ross Zwisler <ross.zwisler@linux.intel.com>
+M:      Ross Zwisler <zwisler@kernel.org>
 M:      Vishal Verma <vishal.l.verma@intel.com>
 M:      Dave Jiang <dave.jiang@intel.com>
 L:      linux-nvdimm@lists.01.org