Merge tag 'ecryptfs-4.7-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 16:48:28 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 16:48:28 +0000 (09:48 -0700)
commitb987c759d21a1c7551357e3bc74e7f8026e696a2
tree6ea21e9895876957eb70d3a559781148c5a81340
parentb89c44bb233b51c3f03eaff22802a70036edf7cd
parentf0fe970df3838c202ef6c07a4c2b36838ef0a88b
Merge tag 'ecryptfs-4.7-rc7-fixes' of git://git./linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs fixes from Tyler Hicks:
 "Provide a more concise fix for CVE-2016-1583:
   - Additionally fixes linux-stable regressions caused by the
     cherry-picking of the original fix

  Some very minor changes that have queued up:
   - Fix typos in code comments
   - Remove unnecessary check for NULL before destroying kmem_cache"

* tag 'ecryptfs-4.7-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: don't allow mmap when the lower fs doesn't support it
  Revert "ecryptfs: forbid opening files without mmap handler"
  ecryptfs: fix spelling mistakes
  eCryptfs: fix typos in comment
  ecryptfs: drop null test before destroy functions