diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 01:21:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 01:21:44 +0200 |
commit | b8e9dbacdd60c5a20ab2c77c08f047b2b990f303 (patch) | |
tree | 5778963b48646331d9e4706a40c7b246f660c008 /MAINTAINERS | |
parent | Merge branch 'for-3.10' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
parent | eCryptfs: Check return of filemap_write_and_wait during fsync (diff) | |
download | linux-b8e9dbacdd60c5a20ab2c77c08f047b2b990f303.tar.xz linux-b8e9dbacdd60c5a20ab2c77c08f047b2b990f303.zip |
Merge tag 'ecryptfs-3.10-rc5-msync' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Pull ecryptfs fixes from Tyler Hicks:
- Fixes how eCryptfs handles msync to sync both the upper and lower
file
- A couple of MAINTAINERS updates
* tag 'ecryptfs-3.10-rc5-msync' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: Check return of filemap_write_and_wait during fsync
Update eCryptFS maintainers
ecryptfs: fixed msync to flush data
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f35a259a6564..73a5f63fb169 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2890,8 +2890,8 @@ F: drivers/media/dvb-frontends/ec100* ECRYPT FILE SYSTEM M: Tyler Hicks <tyhicks@canonical.com> -M: Dustin Kirkland <dustin.kirkland@gazzang.com> L: ecryptfs@vger.kernel.org +W: http://ecryptfs.org W: https://launchpad.net/ecryptfs S: Supported F: Documentation/filesystems/ecryptfs.txt |