Greg Kroah-Hartman c17f89cb74 Merge 8829687a4a ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux") into android-mainline ...

Steps on the way to 6.7-rc1

Resolves merge conflicts in:
	fs/crypto/fscrypt_private.h
	fs/crypto/inline_crypt.c

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

2023-11-06 18:50:11 +00:00

6.6 KiB

Raw Permalink Blame History

View Raw