From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Jun 2020 19:10:17 +0000 (-0700)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
X-Git-Tag: v5.10.7~2538
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afdb0f2ec57d4899eda2c5e09fc3a005f2119690;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'fscrypt-for-linus' of git://git./fs/fscrypt/fscrypt

Pull fscrypt updates from Eric Biggers:

 - Add the IV_INO_LBLK_32 encryption policy flag which modifies the
   encryption to be optimized for eMMC inline encryption hardware.

 - Make the test_dummy_encryption mount option for ext4 and f2fs support
   v2 encryption policies.

 - Fix kerneldoc warnings and some coding style inconsistencies.

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fscrypt: add support for IV_INO_LBLK_32 policies
  fscrypt: make test_dummy_encryption use v2 by default
  fscrypt: support test_dummy_encryption=v2
  fscrypt: add fscrypt_add_test_dummy_key()
  linux/parser.h: add include guards
  fscrypt: remove unnecessary extern keywords
  fscrypt: name all function parameters
  fscrypt: fix all kerneldoc warnings
---

afdb0f2ec57d4899eda2c5e09fc3a005f2119690