• Linus Torvalds's avatar
    Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt · afdb0f2e
    Linus Torvalds authored
    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
    afdb0f2e
ext4.h 121 KB