Greg Kroah-Hartman a17a563d16 Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline ... Merges along the way to 5.9-rc1 resolves conflicts in: Documentation/ABI/testing/sysfs-class-power drivers/power/supply/power_supply_sysfs.c fs/crypto/inline_crypt.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ia087834f54fb4e5269d68c3c404747ceed240701		2020-08-08 13:07:20 +02:00
..
bio.c	ANDROID: fscrypt: fix DUN contiguity with inline encryption + IV_INO_LBLK_32 policies	2020-07-14 15:48:33 +00:00
crypto.c	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
fname.c	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
fscrypt_private.h	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
hkdf.c	fscrypt: use crypto_shash_tfm_digest()	2020-05-08 15:32:14 +10:00
hooks.c	Merge afdb0f2ec5 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline	2020-06-05 10:50:58 +02:00
inline_crypt.c	Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline	2020-08-08 13:07:20 +02:00
Kconfig	fscrypt: switch fscrypt_do_sha256() to use the SHA-256 library	2020-07-21 16:02:13 -07:00
keyring.c	Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline	2020-08-08 13:07:20 +02:00
keysetup_v1.c	Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline	2020-08-08 13:07:20 +02:00
keysetup.c	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
Makefile	fscrypt: add inline encryption support	2020-07-08 10:29:30 -07:00
policy.c	fscrypt: use smp_load_acquire() for ->i_crypt_info	2020-07-21 16:02:13 -07:00