tree ce4fdd6374a33dd22941969710ceaa5b2f254145
parent a85e9696abc54498e45c982caa7855ee4c8e6aae
parent 62a3a6644ddf92a268d68549e7fc824357bdd11e
author Jaegeuk Kim <jaegeuk@google.com> 1557352440 -0700
committer Jaegeuk Kim <jaegeuk@google.com> 1557352440 -0700

Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.9.y' into android-4.9

* origin/upstream-f2fs-stable-linux-4.9.y:
  ext4: don't bother checking for encryption key in ->mmap()
  fscrypt: remove filesystem specific build config option
  f2fs: use IS_ENCRYPTED() to check encryption status
  ext4: use IS_ENCRYPTED() to check encryption status
  fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
  fscrypt: remove CRYPTO_CTR dependency
  fscrypt: add Adiantum support / removed speck
  ext4: switch to fscrypt_prepare_setattr()
  ext4: switch to fscrypt_prepare_rename()
  ext4: switch to fscrypt_prepare_link()
  ext4: switch to fscrypt_file_open()
  ext4, dax: set ext4_dax_aops for dax files

Change-Id: I31eeeb3670e1f46d77018ec7f9994ecf5d8a1a4e
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>