Files
msm-5.15/include/linux
Eric Biggers f58685e5fe Merge commit 3208167a86 ("Merge tag 'filelock-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux") into android-mainline
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>
2020-08-04 11:40:15 -07:00
..
2020-06-01 09:17:17 +02:00
2020-07-06 09:05:59 +02:00
2020-05-18 20:58:23 +00:00
2020-05-09 16:15:13 -06:00
2020-05-24 20:48:11 +02:00
2020-07-08 10:48:35 -07:00
2020-05-19 09:40:29 -06:00
2020-03-30 09:28:50 +02:00
2020-04-10 15:36:21 -07:00
2020-06-25 08:24:32 -07:00
2020-06-25 14:25:32 +02:00
2020-07-20 10:50:17 +02:00
2020-03-09 11:12:19 +01:00
2020-07-20 10:50:17 +02:00
2020-05-04 11:19:58 -07:00
2020-03-06 11:06:15 +01:00
2020-06-09 09:39:13 -07:00
2020-05-28 07:59:45 -07:00
2020-04-30 12:54:01 -07:00
2020-05-18 10:30:21 +01:00
2020-06-02 15:15:46 +01:00
2020-05-08 18:18:11 +01:00
2020-05-08 00:12:42 +02:00
2020-05-28 10:31:09 +02:00
2020-03-06 11:56:59 +01:00
2020-04-07 10:43:38 -07:00
2020-06-25 14:25:32 +02:00
2020-07-31 18:08:59 +10:00
2020-03-21 16:00:24 +01:00
2020-05-09 13:57:12 +02:00
2020-07-23 17:34:18 +10:00
2020-04-02 09:35:27 -07:00
2020-05-15 13:51:28 -07:00
2020-06-25 14:25:32 +02:00
2020-05-09 13:57:12 +02:00
2020-07-20 10:50:17 +02:00
2020-06-25 14:25:32 +02:00
2020-02-21 10:31:18 +01:00
2020-03-21 16:00:24 +01:00
2020-05-17 14:10:07 -06:00
2020-05-14 16:44:24 +02:00
2020-04-28 11:05:44 +02:00
2020-05-04 09:16:37 -07:00
2020-02-21 11:22:15 -08:00
2020-05-29 14:52:53 +02:00
2020-03-23 17:01:47 +01:00
2020-04-01 12:06:26 -04:00
2020-04-17 06:05:30 -04:00
2020-06-26 00:27:38 -07:00