Skip to content

Commit bfbb6cb

Browse files
committed
Merge branch 'for-7.1/cxl-misc' into cxl-for-next
MAINTAINERS: Update address for Dan Williams
2 parents 202432a + 9b6e1ed commit bfbb6cb

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
204204
Corey Minyard <minyard@acm.org>
205205
Damian Hobson-Garcia <dhobsong@igel.co.jp>
206206
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
207+
Dan Williams <djbw@kernel.org> <dan.j.williams@intel.com>
207208
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
208209
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
209210
Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>

MAINTAINERS

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4058,7 +4058,7 @@ S: Maintained
40584058
F: crypto/rsa*
40594059

40604060
ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
4061-
R: Dan Williams <dan.j.williams@intel.com>
4061+
R: Dan Williams <djbw@kernel.org>
40624062
S: Odd fixes
40634063
W: http://sourceforge.net/projects/xscaleiop
40644064
F: Documentation/crypto/async-tx-api.rst
@@ -6429,7 +6429,7 @@ M: Dave Jiang <dave.jiang@intel.com>
64296429
M: Alison Schofield <alison.schofield@intel.com>
64306430
M: Vishal Verma <vishal.l.verma@intel.com>
64316431
M: Ira Weiny <ira.weiny@intel.com>
6432-
M: Dan Williams <dan.j.williams@intel.com>
6432+
M: Dan Williams <djbw@kernel.org>
64336433
L: linux-cxl@vger.kernel.org
64346434
S: Maintained
64356435
F: Documentation/driver-api/cxl
@@ -7290,7 +7290,7 @@ S: Maintained
72907290
F: scripts/dev-needs.sh
72917291

72927292
DEVICE DIRECT ACCESS (DAX)
7293-
M: Dan Williams <dan.j.williams@intel.com>
7293+
M: Dan Williams <djbw@kernel.org>
72947294
M: Vishal Verma <vishal.l.verma@intel.com>
72957295
M: Dave Jiang <dave.jiang@intel.com>
72967296
L: nvdimm@lists.linux.dev
@@ -9803,7 +9803,7 @@ F: include/linux/fcntl.h
98039803
F: include/uapi/linux/fcntl.h
98049804

98059805
FILESYSTEM DIRECT ACCESS (DAX)
9806-
M: Dan Williams <dan.j.williams@intel.com>
9806+
M: Dan Williams <djbw@kernel.org>
98079807
R: Matthew Wilcox <willy@infradead.org>
98089808
R: Jan Kara <jack@suse.cz>
98099809
L: linux-fsdevel@vger.kernel.org
@@ -12861,7 +12861,7 @@ F: drivers/platform/x86/intel/hid.c
1286112861

1286212862
INTEL I/OAT DMA DRIVER
1286312863
M: Dave Jiang <dave.jiang@intel.com>
12864-
R: Dan Williams <dan.j.williams@intel.com>
12864+
R: Dan Williams <djbw@kernel.org>
1286512865
L: dmaengine@vger.kernel.org
1286612866
S: Supported
1286712867
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
@@ -14564,7 +14564,7 @@ K: libie
1456414564

1456514565
LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
1456614566
M: Vishal Verma <vishal.l.verma@intel.com>
14567-
M: Dan Williams <dan.j.williams@intel.com>
14567+
M: Dan Williams <djbw@kernel.org>
1456814568
M: Dave Jiang <dave.jiang@intel.com>
1456914569
L: nvdimm@lists.linux.dev
1457014570
S: Supported
@@ -14573,7 +14573,7 @@ P: Documentation/nvdimm/maintainer-entry-profile.rst
1457314573
F: drivers/nvdimm/btt*
1457414574

1457514575
LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
14576-
M: Dan Williams <dan.j.williams@intel.com>
14576+
M: Dan Williams <djbw@kernel.org>
1457714577
M: Vishal Verma <vishal.l.verma@intel.com>
1457814578
M: Dave Jiang <dave.jiang@intel.com>
1457914579
L: nvdimm@lists.linux.dev
@@ -14591,7 +14591,7 @@ F: Documentation/devicetree/bindings/pmem/pmem-region.yaml
1459114591
F: drivers/nvdimm/of_pmem.c
1459214592

1459314593
LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
14594-
M: Dan Williams <dan.j.williams@intel.com>
14594+
M: Dan Williams <djbw@kernel.org>
1459514595
M: Vishal Verma <vishal.l.verma@intel.com>
1459614596
M: Dave Jiang <dave.jiang@intel.com>
1459714597
M: Ira Weiny <ira.weiny@intel.com>
@@ -26858,7 +26858,7 @@ S: Maintained
2685826858
F: Documentation/devicetree/bindings/trigger-source/*
2685926859

2686026860
TRUSTED EXECUTION ENVIRONMENT SECURITY MANAGER (TSM)
26861-
M: Dan Williams <dan.j.williams@intel.com>
26861+
M: Dan Williams <djbw@kernel.org>
2686226862
L: linux-coco@lists.linux.dev
2686326863
S: Maintained
2686426864
F: Documentation/ABI/testing/configfs-tsm-report

0 commit comments

Comments
 (0)