summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2026-04-04 01:55:34 +0300
committerDave Jiang <dave.jiang@intel.com>2026-04-04 01:55:34 +0300
commitbfbb6cb1b6e4086b00584c4269324bb15f7d9221 (patch)
tree7e775d3057f05822fb3bc5305b00a8c029404aac
parent202432ae8a6948ab6c88b56eaf2848a23637d9f0 (diff)
parent9b6e1ed28a7f239cc9184101cedc6fec4c3b3dc9 (diff)
downloadlinux-bfbb6cb1b6e4086b00584c4269324bb15f7d9221.tar.xz
Merge branch 'for-7.1/cxl-misc' into cxl-for-next
MAINTAINERS: Update address for Dan Williams
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS18
2 files changed, 10 insertions, 9 deletions
diff --git a/.mailmap b/.mailmap
index 63c11ea7e35d..215fe2329cf4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -204,6 +204,7 @@ Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
Corey Minyard <minyard@acm.org>
Damian Hobson-Garcia <dhobsong@igel.co.jp>
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
+Dan Williams <djbw@kernel.org> <dan.j.williams@intel.com>
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
diff --git a/MAINTAINERS b/MAINTAINERS
index 96ea84948d76..1a58c53f7627 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4058,7 +4058,7 @@ S: Maintained
F: crypto/rsa*
ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
-R: Dan Williams <dan.j.williams@intel.com>
+R: Dan Williams <djbw@kernel.org>
S: Odd fixes
W: http://sourceforge.net/projects/xscaleiop
F: Documentation/crypto/async-tx-api.rst
@@ -6429,7 +6429,7 @@ 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 <dan.j.williams@intel.com>
+M: Dan Williams <djbw@kernel.org>
L: linux-cxl@vger.kernel.org
S: Maintained
F: Documentation/driver-api/cxl
@@ -7290,7 +7290,7 @@ S: Maintained
F: scripts/dev-needs.sh
DEVICE DIRECT ACCESS (DAX)
-M: Dan Williams <dan.j.williams@intel.com>
+M: Dan Williams <djbw@kernel.org>
M: Vishal Verma <vishal.l.verma@intel.com>
M: Dave Jiang <dave.jiang@intel.com>
L: nvdimm@lists.linux.dev
@@ -9803,7 +9803,7 @@ F: include/linux/fcntl.h
F: include/uapi/linux/fcntl.h
FILESYSTEM DIRECT ACCESS (DAX)
-M: Dan Williams <dan.j.williams@intel.com>
+M: Dan Williams <djbw@kernel.org>
R: Matthew Wilcox <willy@infradead.org>
R: Jan Kara <jack@suse.cz>
L: linux-fsdevel@vger.kernel.org
@@ -12861,7 +12861,7 @@ F: drivers/platform/x86/intel/hid.c
INTEL I/OAT DMA DRIVER
M: Dave Jiang <dave.jiang@intel.com>
-R: Dan Williams <dan.j.williams@intel.com>
+R: Dan Williams <djbw@kernel.org>
L: dmaengine@vger.kernel.org
S: Supported
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
@@ -14564,7 +14564,7 @@ K: libie
LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
M: Vishal Verma <vishal.l.verma@intel.com>
-M: Dan Williams <dan.j.williams@intel.com>
+M: Dan Williams <djbw@kernel.org>
M: Dave Jiang <dave.jiang@intel.com>
L: nvdimm@lists.linux.dev
S: Supported
@@ -14573,7 +14573,7 @@ P: Documentation/nvdimm/maintainer-entry-profile.rst
F: drivers/nvdimm/btt*
LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
-M: Dan Williams <dan.j.williams@intel.com>
+M: Dan Williams <djbw@kernel.org>
M: Vishal Verma <vishal.l.verma@intel.com>
M: Dave Jiang <dave.jiang@intel.com>
L: nvdimm@lists.linux.dev
@@ -14591,7 +14591,7 @@ F: Documentation/devicetree/bindings/pmem/pmem-region.yaml
F: drivers/nvdimm/of_pmem.c
LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
-M: Dan Williams <dan.j.williams@intel.com>
+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>
@@ -26858,7 +26858,7 @@ S: Maintained
F: Documentation/devicetree/bindings/trigger-source/*
TRUSTED EXECUTION ENVIRONMENT SECURITY MANAGER (TSM)
-M: Dan Williams <dan.j.williams@intel.com>
+M: Dan Williams <djbw@kernel.org>
L: linux-coco@lists.linux.dev
S: Maintained
F: Documentation/ABI/testing/configfs-tsm-report