summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShannon Nelson <shannon.nelson@amd.com>2022-11-29 02:17:34 +0100
committerJakub Kicinski <kuba@kernel.org>2022-11-29 17:31:39 +0100
commit91a2bbfff3e3c64b3e1aa3ad04381d0572b3d543 (patch)
treefeb2b4a7544b536dd02d3ca9b0dbcdb9e44a269a
parentsctp: fix memory leak in sctp_stream_outq_migrate() (diff)
downloadlinux-91a2bbfff3e3c64b3e1aa3ad04381d0572b3d543.tar.xz
linux-91a2bbfff3e3c64b3e1aa3ad04381d0572b3d543.zip
ionic: update MAINTAINERS entry
Now that Pensando is a part of AMD we need to update a couple of addresses. We're keeping the mailing list address for the moment, but that will likely change in the near future. Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> Signed-off-by: Brett Creeley <brett.creeley@amd.com> Link: https://lore.kernel.org/r/20221129011734.20849-1-shannon.nelson@amd.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS3
2 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index fdd7989492fc..c12809090d76 100644
--- a/.mailmap
+++ b/.mailmap
@@ -389,6 +389,7 @@ Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
+Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 4a203c5f6c27..3480734b04d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16139,7 +16139,8 @@ F: include/linux/peci-cpu.h
F: include/linux/peci.h
PENSANDO ETHERNET DRIVERS
-M: Shannon Nelson <snelson@pensando.io>
+M: Shannon Nelson <shannon.nelson@amd.com>
+M: Brett Creeley <brett.creeley@amd.com>
M: drivers@pensando.io
L: netdev@vger.kernel.org
S: Supported