Merge 14f19dc6 ("Merge tag 'fscrypt-for-linus' of...

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

) into android-mainline

Steps on the way to 6.16-rc1

Resolve merge conflicts in:
	fs/crypto/fscrypt_private.h
	fs/crypto/keyring.c
	include/uapi/linux/fscrypt.h

Cc: Eric Biggers <ebiggers@google.com>
Cc: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0b5e028e094ae61f2649c35338933f55b4a163be
Signed-off-by: Carlos Llamas <cmllamas@google.com>