author | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 20 Apr 2018 16:08:37 +0000 (09:08 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 20 Apr 2018 16:08:37 +0000 (09:08 -0700) | ||
commit | 43f70c960180c11d64ee3e9e53075fe1acd43ff1 | |
tree | 653ebe7e04fd7367904678e302b2bdd74776faaa | tree | snapshot (tar.xz tar.gz zip) |
parent | 0d9cf33b4aabd8de03f80659ceae967ba2b3ba30 | commit | diff |
parent | e86281e700cca8a773f9a572fa406adf2784ba5c | commit | diff |
Merge tag 'ecryptfs-4.17-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Pull eCryptfs fixes from Tyler Hicks:
"Minor cleanups and a bug fix to completely ignore unencrypted
filenames in the lower filesystem when filename encryption is enabled
at the eCryptfs layer"
* tag 'ecryptfs-4.17-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: don't pass up plaintext names when using filename encryption
ecryptfs: fix spelling mistake: "cadidate" -> "candidate"
ecryptfs: lookup: Don't check if mount_crypt_stat is NULL
Pull eCryptfs fixes from Tyler Hicks:
"Minor cleanups and a bug fix to completely ignore unencrypted
filenames in the lower filesystem when filename encryption is enabled
at the eCryptfs layer"
* tag 'ecryptfs-4.17-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: don't pass up plaintext names when using filename encryption
ecryptfs: fix spelling mistake: "cadidate" -> "candidate"
ecryptfs: lookup: Don't check if mount_crypt_stat is NULL