Greg Kroah-Hartman 79e8be5726 Merge 616355cc81 ("Merge tag 'for-5.18/block-2022-03-18' of git://git.kernel.dk/linux-block") into android-mainline ... Steps on the way to 5.18-rc1 Resolves conflicts in: fs/iomap/direct-io.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I1d5e0c5da8f943631d9bc87ee9b2736acafba17e		2022-03-26 10:51:32 +01:00
..
bio.c	block: pass a block_device and opf to bio_reset	2022-02-02 07:50:00 -07:00
crypto.c	FROMLIST: fscrypt: Add functions for direct I/O support	2021-02-26 13:23:01 +01:00
fname.c	fscrypt: remove fscrypt_operations::max_namelen	2021-09-20 19:32:33 -07:00
fscrypt_private.h	ANDROID: fscrypt: add support for hardware-wrapped keys	2021-11-04 12:27:15 -07:00
hkdf.c	ANDROID: fscrypt: add support for hardware-wrapped keys	2021-11-04 12:27:15 -07:00
hooks.c	fscrypt: add fscrypt_symlink_getattr() for computing st_size	2021-07-25 20:01:06 -07:00
inline_crypt.c	ANDROID: fscrypt: add support for hardware-wrapped keys	2021-11-04 12:27:15 -07:00
Kconfig	fscrypt: relax Kconfig dependencies for crypto API algorithms	2021-04-22 17:31:32 +10:00
keyring.c	ANDROID: fscrypt: add support for hardware-wrapped keys	2021-11-04 12:27:15 -07:00
keysetup_v1.c	ANDROID: fscrypt: add support for hardware-wrapped keys	2021-11-04 12:27:15 -07:00
keysetup.c	ANDROID: fscrypt: add support for hardware-wrapped keys	2021-11-04 12:27:15 -07:00
Makefile	fscrypt: add inline encryption support	2020-07-08 10:29:30 -07:00
policy.c	inode: make init and permission helpers idmapped mount aware	2021-01-24 14:27:16 +01:00