Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit c83b5527 authored by Satya Tangirala's avatar Satya Tangirala Committed by Gaurav Kashyap
Browse files

Merge fbe changes from upstream 5.4

b7b3af96 BACKPORT: FROMLIST: Update Inline Encryption from v5 to v6 of patch series
4f6a1f4a ANDROID: ufshcd-crypto: export cap find API
e25d82c5 ANDROID: block: provide key size as input to inline crypto APIs
3e8cceb7 ANDROID: block: add KSM op to derive software secret from wrapped key
81734875 ANDROID: fscrypt: add support for hardware-wrapped keys
8aaaa67f ANDROID: block: fix some inline crypto bugs
9f8ee7b4 ANDROID: block: export symbols needed for modules to use inline crypto
0faba9a8 FROMLIST: scsi: ufs: add program_key() variant op
403731b1 ANDROID: ext4, f2fs: enable direct I/O with inline encryption
1fc06baa ANDROID: block: Introduce passthrough keyslot manager
695cfeb0 ANDROID: dm: add support for passing through inline crypto support
85942bcd ANDROID: dm: enable may_passthrough_inline_crypto on some targets
55153242 ANDROID: dm: add dm-default-key target for metadata encryption
792b1828 ANDROID: gki_defconfig: enable dm-default-key
3ab19729 ANDROID: block: Prevent crypto fallback for wrapped keys
a1423568 ANDROID: dm: add support for passing through derive_raw_secret
0dccdc03 ANDROID: dm: Add wrapped key support in dm-default-key

Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android-5.4


Change-Id: Ida31c27ac24457efc1aa0343806e2f32a056167b
Signed-off-by: default avatarGaurav Kashyap <gaurkash@codeaurora.org>
parent e2298d13
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment