[GIT,PULL] fscrypt updates for 5.8
mbox series

Message ID 20200601062848.GA11054@sol.localdomain
State Accepted
Headers show
Series
  • [GIT,PULL] fscrypt updates for 5.8
Related show

Pull-request

https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt-for-linus

Message

Eric Biggers June 1, 2020, 6:28 a.m. UTC
The following changes since commit 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8:

  Linux 5.7-rc5 (2020-05-10 15:16:58 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt-for-linus

for you to fetch changes up to e3b1078bedd323df343894a27eb3b3c34944dfd1:

  fscrypt: add support for IV_INO_LBLK_32 policies (2020-05-19 09:34:18 -0700)

----------------------------------------------------------------

- 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.

There will be merge conflicts with the ext4 and f2fs trees due to the
test_dummy_encryption change, but the resolutions are straightforward.

----------------------------------------------------------------
Eric Biggers (8):
      fscrypt: fix all kerneldoc warnings
      fscrypt: name all function parameters
      fscrypt: remove unnecessary extern keywords
      linux/parser.h: add include guards
      fscrypt: add fscrypt_add_test_dummy_key()
      fscrypt: support test_dummy_encryption=v2
      fscrypt: make test_dummy_encryption use v2 by default
      fscrypt: add support for IV_INO_LBLK_32 policies

 Documentation/filesystems/f2fs.rst    |   6 +-
 Documentation/filesystems/fscrypt.rst |  33 +++++-
 fs/crypto/crypto.c                    |  15 ++-
 fs/crypto/fname.c                     |  52 ++++++---
 fs/crypto/fscrypt_private.h           | 111 +++++++++---------
 fs/crypto/hooks.c                     |   4 +-
 fs/crypto/keyring.c                   | 122 ++++++++++++-------
 fs/crypto/keysetup.c                  | 109 ++++++++++++-----
 fs/crypto/policy.c                    | 195 ++++++++++++++++++++++++++++---
 fs/ext4/ext4.h                        |   7 +-
 fs/ext4/super.c                       |  68 ++++++++---
 fs/ext4/sysfs.c                       |   2 +
 fs/f2fs/f2fs.h                        |   4 +-
 fs/f2fs/super.c                       |  85 ++++++++++----
 fs/f2fs/sysfs.c                       |   4 +
 include/linux/fscrypt.h               | 214 ++++++++++++++++++++--------------
 include/linux/parser.h                |   5 +-
 include/uapi/linux/fscrypt.h          |   3 +-
 18 files changed, 737 insertions(+), 302 deletions(-)

Comments

pr-tracker-bot@kernel.org June 1, 2020, 7:35 p.m. UTC | #1
The pull request you sent on Sun, 31 May 2020 23:28:48 -0700:

> https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/afdb0f2ec57d4899eda2c5e09fc3a005f2119690

Thank you!