From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Feb 2017 02:22:31 +0000 (-0800)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: MMI-PSA29.97-13-9~6176
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6c24337f22115d669e24ce990842dab667371b4d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'fscrypt-for-linus' of git://git./linux/kernel/git/tytso/fscrypt

Pull fscrypt updates from Ted Ts'o:
 "Various cleanups for the file system encryption feature"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: constify struct fscrypt_operations
  fscrypt: properly declare on-stack completion
  fscrypt: split supp and notsupp declarations into their own headers
  fscrypt: remove redundant assignment of res
  fscrypt: make fscrypt_operations.key_prefix a string
  fscrypt: remove unused 'mode' member of fscrypt_ctx
  ext4: don't allow encrypted operations without keys
  fscrypt: make test_dummy_encryption require a keyring key
  fscrypt: factor out bio specific functions
  fscrypt: pass up error codes from ->get_context()
  fscrypt: remove user-triggerable warning messages
  fscrypt: use EEXIST when file already uses different policy
  fscrypt: use ENOTDIR when setting encryption policy on nondirectory
  fscrypt: use ENOKEY when file cannot be created w/o key
---

6c24337f22115d669e24ce990842dab667371b4d