summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-08-21 12:16:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2026-08-21 12:16:31 -0700
commit614b9fb585f143d65162f17f1a4b4ec4cbdf5794 (patch)
tree44ceff9d1560674730ebf2bb2d9755e2159d9e13
parent2be02a7c996aa733bb36e29e07715621b0de9736 (diff)
parent934753d26f1ed7fadeedf1b9e7df6fe75de303e8 (diff)
Merge tag 'cifs-maintainer-switch-7.3-rc1' of https://git.manguebit.org/linux
Pull cifs maintainer update from Paulo Alcantara. * tag 'cifs-maintainer-switch-7.3-rc1' of https://git.manguebit.org/linux: MAINTAINERS: Replace Steve French as CIFS maintainer
-rw-r--r--CREDITS5
-rw-r--r--MAINTAINERS7
2 files changed, 8 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 0069cb5bb424..ba57698dcc10 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1324,6 +1324,11 @@ D: Initial GPL'd Frame Relay driver
D: Dynamic PPP devices
D: Sundry modularizations (PPP, IPX, ...) and fixes
+N: Steve French
+E: sfrench@samba.org
+E: smfrench@gmail.com
+D: Author and maintainer of the cifs filesystem for many years.
+
N: Bob Frey
E: bobf@advansys.com
D: AdvanSys SCSI driver
diff --git a/MAINTAINERS b/MAINTAINERS
index 070e33587074..8e4f4b4e6cd1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6471,9 +6471,8 @@ F: rust/kernel/clk.rs
X: drivers/clk/clkdev.c
COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)
-M: Steve French <sfrench@samba.org>
-M: Steve French <smfrench@gmail.com>
-R: Paulo Alcantara <pc@manguebit.org> (DFS, global name space)
+M: Paulo Alcantara <pc@manguebit.org>
+M: Namjae Jeon <linkinjeon@kernel.org>
R: Ronnie Sahlberg <ronniesahlberg@gmail.com> (directory leases, sparse files)
R: Shyam Prasad N <sprasad@microsoft.com> (multichannel)
R: Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
@@ -6482,7 +6481,7 @@ L: linux-cifs@vger.kernel.org
L: samba-technical@lists.samba.org (moderated for non-subscribers)
S: Supported
W: https://wiki.samba.org/index.php/LinuxCIFS
-T: git https://git.samba.org/sfrench/cifs-2.6.git for-next
+T: git https://git.manguebit.org/linux.git cifs-next
F: Documentation/admin-guide/cifs/
F: fs/smb/client/
F: fs/smb/common/