diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 19:21:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 19:21:44 -0400 |
| commit | b8e9dbacdd60c5a20ab2c77c08f047b2b990f303 (patch) | |
| tree | 5778963b48646331d9e4706a40c7b246f660c008 /MAINTAINERS | |
| parent | e4327859341f2d3a93b4b6fef2ea483eac1c270c (diff) | |
| parent | bc5abcf7e411b889f73ea2a90439071a0f451011 (diff) | |
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* | |||
| 2890 | 2890 | ||
| 2891 | ECRYPT FILE SYSTEM | 2891 | ECRYPT FILE SYSTEM |
| 2892 | M: Tyler Hicks <tyhicks@canonical.com> | 2892 | M: Tyler Hicks <tyhicks@canonical.com> |
| 2893 | M: Dustin Kirkland <dustin.kirkland@gazzang.com> | ||
| 2894 | L: ecryptfs@vger.kernel.org | 2893 | L: ecryptfs@vger.kernel.org |
| 2894 | W: http://ecryptfs.org | ||
| 2895 | W: https://launchpad.net/ecryptfs | 2895 | W: https://launchpad.net/ecryptfs |
| 2896 | S: Supported | 2896 | S: Supported |
| 2897 | F: Documentation/filesystems/ecryptfs.txt | 2897 | F: Documentation/filesystems/ecryptfs.txt |