Carlos Llamas 06366f98c0 Merge 9932f00bf4 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux") into android-mainline ...

Steps on the way to v7.1-rc1

Resolve merge conflicts in:
	fs/crypto/inline_crypt.c
	fs/f2fs/data.c

Cc: Eric Biggers <ebiggers@google.com>
Change-Id: If636fbf0817786481871e8915d0cc04f2c929482
Signed-off-by: Carlos Llamas <cmllamas@google.com>

2026-05-04 23:08:19 +00:00

..

bio.c

fscrypt: pass a real sector_t to fscrypt_zeroout_range

2026-03-09 13:34:21 -07:00

crypto.c

treewide: change inode->i_ino from unsigned long to u64

2026-03-06 14:31:28 +01:00

fname.c

fs: add helpers name_is_dot{,dot,_dotdot}

2026-01-29 10:06:59 +01:00

fscrypt_private.h

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

2026-05-04 23:08:19 +00:00

hkdf.c

fscrypt: use HMAC-SHA512 library for HKDF

2025-09-05 21:01:51 -07:00

hooks.c

treewide: change inode->i_ino from unsigned long to u64

2026-03-06 14:31:28 +01:00

inline_crypt.c

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

2026-05-04 23:08:19 +00:00

Kconfig

fscrypt: use AES library for v1 key derivation

2026-03-25 12:06:33 -07:00

keyring.c

Merge b7d74ea0fd ("Merge tag 'vfs-7.1-rc1.kino' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs") into android-mainline

2026-05-01 03:53:59 +00:00

keysetup_v1.c

fscrypt: use AES library for v1 key derivation

2026-03-25 12:06:33 -07:00

keysetup.c

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux

2026-04-13 17:29:12 -07:00

Makefile

…

policy.c

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00