Files
kernel_arpi/include/uapi/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-05-28 11:22:14 +02:00
2020-05-18 08:44:32 +02:00
2019-12-18 18:07:31 +01:00
2019-10-09 22:31:14 -04:00
2019-09-25 17:51:39 -07:00
2020-06-01 11:49:23 -07:00
2020-04-27 16:29:41 +05:30
2020-06-24 21:34:11 +02:00
2020-05-14 16:44:25 +02:00
2020-05-28 22:09:47 -04:00
2019-12-11 15:31:52 +01:00
2020-04-20 12:43:24 -07:00
2019-09-08 15:37:04 +02:00
2020-05-01 10:00:19 -04:00
2020-05-21 08:20:35 -06:00
2020-03-29 22:30:57 -07:00
2020-03-29 22:14:49 -07:00
2020-01-18 09:19:18 -05:00
2019-10-02 20:32:27 -06:00
2020-05-21 17:04:07 -07:00
2020-03-29 22:30:57 -07:00
2020-01-26 15:28:47 +01:00
2019-12-18 18:07:31 +01:00
2019-12-09 09:59:07 +01:00
2020-03-29 23:29:08 +02:00
2019-09-18 20:17:50 +02:00
2020-06-27 09:48:57 +02:00
2020-04-20 07:26:42 +02:00