X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=MAINTAINERS;h=a04977ddd3e421d962f6553624a01a919a9f3ae6;hb=78c681d9f42cb56e30c8946e5d7b05f0bc6e86f2;hp=e0eac465958277ab67f6d04894059d685fdb5c8e;hpb=0bd623398f2e085e6a801bb4ce9b90b03fcff061;p=fs%2Flustre-release.git

diff --git a/MAINTAINERS b/MAINTAINERS
index e0eac46..a04977d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -129,6 +129,19 @@ S:	Supported
 F:	lustre/include/lustre_mdc.h
 F:	lustre/mdc/
 
+Lustre client side encryption
+M:	Sebastien Buisson <sbuisson@whamcloud.com>
+S:	Maintained
+F:	Documentation/client_side_encryption/*.txt
+F:	lustre/llite/crypto*.[ch]
+F:	libcfs/libcfs/crypto/*.[ch]
+F:	libcfs/include/libcfs/crypto/*.h
+F:	libcfs/include/uapi/linux/llcrypt.h
+F:	lustre/include/lustre_crypto.h
+K:	fscrypt
+K:	llcrypt
+K:	HAVE_LUSTRE_CRYPTO
+
 Lustre Client VFS Interface
 R:	Oleg Drokin <green@whamcloud.com>
 M:	Lai Siyao <lai.siyao@whamcloud.com>
@@ -144,7 +157,7 @@ F:	lustre/llite/symlink.c
 F:	lustre/llite/xattr*.c
 
 Lustre Configuration Management
-M:	James Simmons <uja.ornl@yahoo.com>
+M:	James Simmons <jsimmons@infradead.org>
 S:	Maintained
 F:	lustre/mgc/
 F:	lustre/mgs/
@@ -254,12 +267,14 @@ S:	Maintained
 F:	lustre/conf/lgssc.conf
 F:	lustre/conf/lsvcgss
 F:	lustre/doc/lgss_sk.8
+F:	lustre/doc/lfs-flushctx.1
 F:	lustre/llite/xattr_security.c
 F:	lustre/ptlrpc/gss
 F:	lustre/ptlrpc/sec*.c
 F:	lustre/scripts/lsvgss
 F:	lustre/tests/sanity-sec.sh
 F:	lustre/utils/gss
+F:	lustre/include/uapi/linux/lustre/lgss.h
 
 Lustre GSSAPI - Kerberos
 M:	Sebastien Buisson <sbuisson@whamcloud.com>
@@ -301,7 +316,7 @@ S:	Maintained
 F:	lustre/utils/lhsmtool_posix.c
 
 Lustre Kernel Compatibility
-R:	James Simmons <uja.ornl@yahoo.com>
+R:	James Simmons <jsimmons@infradead.org>
 S:	Maintained
 F:	libcfs/
 F:	lustre/include/lustre_compat.h
@@ -440,7 +455,7 @@ F:	lustre/tests/sanity-pcc.sh
 F:	lustre/utils/liblustreapi_pcc.c
 
 Lustre /proc and /sys
-R:	James Simmons <uja.ornl@yahoo.com>
+R:	James Simmons <jsimmons@infradead.org>
 S:	Maintained
 F:	lustre/*/*lproc*.[ch]
 F:	lustre/obdclass/obdsysfs.c