Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Fix encrypted file name lookup regression
  ecryptfs: properly mark init functions
  fs/ecryptfs: Return -ENOMEM on memory allocation failure

...

This commit is contained in:

Linus Torvalds 2010-08-28 14:10:43 -07:00

parent 8f2a0029b8 93c3fe40c2

commit e933424c48

6 changed files with 30 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

fs/ecryptfs/crypto.c

View file

31

fs/ecryptfs/inode.c

View file

2

fs/ecryptfs/keystore.c

View file

2

fs/ecryptfs/kthread.c

View file

2

fs/ecryptfs/messaging.c

View file

2

fs/ecryptfs/miscdev.c

View file