diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-25 15:03:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-25 15:03:04 -0800 |
| commit | 3074c0350b173c9e98b62685e0a61a66d9ff8728 (patch) | |
| tree | 28f2cd48f1278983b1fa7d5b4a5895882ce5ca84 /MAINTAINERS | |
| parent | f8275f9694b8adf9f3498e747ea4c3e8b984499b (diff) | |
| parent | 58ded24f0fcb85bddb665baba75892f6ad0f4b8a (diff) | |
| download | blackbird-op-linux-3074c0350b173c9e98b62685e0a61a66d9ff8728.tar.gz blackbird-op-linux-3074c0350b173c9e98b62685e0a61a66d9ff8728.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Says Tyler:
"Tim's logging message update will be really helpful to users when
they're trying to locate a problematic file in the lower filesystem
with filename encryption enabled.
You'll recognize the fix from Li, as you commented on that.
You should also be familiar with my setattr/truncate improvements,
since you were the one that pointed them out to us (thanks again!).
Andrew noted the /dev/ecryptfs write count sanitization needed to be
improved, so I've got a fix in there for that along with some other
less important cleanups of the /dev/ecryptfs read/write code."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: Fix oops when printing debug info in extent crypto functions
eCryptfs: Remove unused ecryptfs_read()
eCryptfs: Check inode changes in setattr
eCryptfs: Make truncate path killable
eCryptfs: Infinite loop due to overflow in ecryptfs_write()
eCryptfs: Replace miscdev read/write magic numbers
eCryptfs: Report errors in writes to /dev/ecryptfs
eCryptfs: Sanitize write counts of /dev/ecryptfs
ecryptfs: Remove unnecessary variable initialization
ecryptfs: Improve metadata read failure logging
MAINTAINERS: Update eCryptfs maintainer address
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 93c68d5f1cf4..260d9c1785d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2402,7 +2402,7 @@ F: net/bridge/netfilter/ebt*.c ECRYPT FILE SYSTEM M: Tyler Hicks <tyhicks@canonical.com> -M: Dustin Kirkland <kirkland@canonical.com> +M: Dustin Kirkland <dustin.kirkland@gazzang.com> L: ecryptfs@vger.kernel.org W: https://launchpad.net/ecryptfs S: Supported |
