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
..
asm-generic	vfs: add faccessat2 syscall	2020-05-14 16:44:25 +02:00
drm	Merge ad57a1022f ("Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline	2020-06-24 17:54:12 +02:00
linux	Merge commit 3208167a86 ("Merge tag 'filelock-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux") into android-mainline	2020-08-04 11:40:15 -07:00
misc	uapi: habanalabs: add gaudi defines	2020-05-19 14:48:41 +03:00
mtd	mtd: Add support for emulated SLC mode on MLC NANDs	2020-05-11 09:51:41 +02:00
rdma	RDMA 5.8 merge window pull request	2020-06-05 14:05:57 -07:00
scsi	uapi: revert flexible-array conversions	2020-05-04 11:30:15 -05:00
sound	ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT	2020-04-27 16:02:26 +01:00
video
xen
Kbuild