Greg Kroah-Hartman 8f30fa3689 Merge 586592478b ("Merge tag 's390-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux") into android-mainline ...

Steps on the way to 5.11-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib0e3f340d1509c0d9663fc1f0bf68c772d9ffac0

2020-12-15 15:15:57 +01: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 6f5032a852 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline

2020-10-23 11:56:31 +02:00

fname.c

Merge 586592478b ("Merge tag 's390-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux") into android-mainline

2020-12-15 15:15:57 +01:00

fscrypt_private.h

Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline

2020-12-15 14:21:29 +01:00

hkdf.c

crypto: sha - split sha.h into sha1.h and sha2.h

2020-11-20 14:45:33 +11:00

hooks.c

Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline

2020-12-15 14:21:29 +01:00

inline_crypt.c

Merge 585e5b17b9 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline

2020-11-13 08:26:07 +01:00

Kconfig

fscrypt: switch fscrypt_do_sha256() to use the SHA-256 library

2020-07-21 16:02:13 -07:00

keyring.c

Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline

2020-12-15 14:21:29 +01:00

keysetup_v1.c

Merge 6f5032a852 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline

2020-10-23 11:56:31 +02:00

keysetup.c

ANDROID: fix up fscrypt merge to build properly

2020-12-15 14:24:40 +01:00

Makefile

fscrypt: add inline encryption support

2020-07-08 10:29:30 -07:00

policy.c

fscrypt: allow deleting files with unsupported encryption policy

2020-12-02 18:25:01 -08:00