From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Apr 2018 16:08:37 +0000 (-0700)
Subject: Merge tag 'ecryptfs-4.17-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~8985
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43f70c960180c11d64ee3e9e53075fe1acd43ff1;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'ecryptfs-4.17-rc2-fixes' of git://git./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
---

43f70c960180c11d64ee3e9e53075fe1acd43ff1