f58685e5fe
Resolve merge conflicts in fs/crypto/ caused by the non-upstream changes for metadata encryption support [1] and wrapped key support [2]. [1] https://android.googlesource.com/kernel/common-patches/+/refs/heads/master/android-mainline/ANDROID-dm-add-dm-default-key-target-for-metadata-encryption.patch [2] https://android.googlesource.com/kernel/common-patches/+/refs/heads/master/android-mainline/ANDROID-fscrypt-add-support-for-hardware-wrapped-keys.patch Conflicts: fs/crypto/fscrypt_private.h fs/crypto/inline_crypt.c fs/crypto/keysetup.c fs/crypto/keysetup_v1.c fs/f2fs/data.c include/linux/fscrypt.h Bug: 160885805 Bug: 160883801 Test: kvm-xfstests -c ext4,f2fs -g encrypt Change-Id: Icdc9e61b2286c78ba04cec1c9dca421bff545716 Signed-off-by: Eric Biggers <ebiggers@google.com>