Commit 99eed984 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge cfe27f8a ("fscrypt: Don't use problematic non-inline crypto... 


Merge cfe27f8a ("fscrypt: Don't use problematic non-inline crypto engines") into android16-6.12-lts

Steps on the way to 6.12.43

Resolves merge conflicts in:
	fs/crypto/fscrypt_private.h

Change-Id: I99f15c09a720f62d38ef539c353c36e12eb352bd
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 54fc5bc3 cfe27f8a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment