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: Add mount option to check uid of device being mounted = expect uid
  eCryptfs: Fix payload_len unitialized variable warning
  eCryptfs: fix compile error
  eCryptfs: Return error when lower file pointer is NULL

...

This commit is contained in:

Linus Torvalds 2011-08-10 11:08:06 -07:00

parent af9d220bac 764355487e

commit d55140ce3a

4 changed files with 33 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

2

fs/ecryptfs/Kconfig

View file

2

fs/ecryptfs/keystore.c

View file

23

fs/ecryptfs/main.c

View file

18

fs/ecryptfs/read_write.c

View file