X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=MAINTAINERS;h=5dc30f0d40047ca029451e2382b2f1aa49a84b98;hp=a268e985522034db5bacf0c64e56d7b74d426fc3;hb=21fdd616bd4784e4e3571294ba39f00b24a25806;hpb=a813e81870096bcfecbe12aeeed8e1b0114cd474

diff --git a/MAINTAINERS b/MAINTAINERS
index a268e98..5dc30f0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -132,9 +132,15 @@ 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>
@@ -151,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/
@@ -261,6 +267,7 @@ 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
@@ -308,7 +315,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
@@ -447,7 +454,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