| commit | b8e9dbacdd60c5a20ab2c77c08f047b2b990f303 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 07 16:21:44 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 07 16:21:44 2013 -0700 |
| tree | 5778963b48646331d9e4706a40c7b246f660c008 | |
| 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