aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS12
1 files changed, 11 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bd7aff0c120f20..f23bb5cbfd7085 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4530,7 +4530,7 @@ F: include/linux/clk/
F: include/linux/of_clk.h
X: drivers/clk/clkdev.c
-COMMON INTERNET FILE SYSTEM (CIFS)
+COMMON INTERNET FILE SYSTEM CLIENT (CIFS)
M: Steve French <sfrench@samba.org>
L: linux-cifs@vger.kernel.org
L: samba-technical@lists.samba.org (moderated for non-subscribers)
@@ -4540,6 +4540,16 @@ T: git git://git.samba.org/sfrench/cifs-2.6.git
F: Documentation/admin-guide/cifs/
F: fs/cifs/
+COMMON INTERNET FILE SYSTEM SERVER (CIFSD)
+M: Namjae Jeon <namjae.jeon@samsung.com>
+M: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+M: Steve French <sfrench@samba.org>
+M: Hyunchul Lee <hyc.lee@gmail.com>
+L: linux-cifs@vger.kernel.org
+L: linux-cifsd-devel@lists.sourceforge.net
+S: Maintained
+F: fs/cifsd/
+
COMPACTPCI HOTPLUG CORE
M: Scott Murray <scott@spiteful.org>
L: linux-pci@vger.kernel.org