Greg Kroah-Hartman 6d304c90e6 Merge f7b36dc5cb ("Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline ...

Steps on the way to 5.12-rc1.

Resolves merge issues with:
	fs/verity/signature.c
	include/linux/fsverity.h

Cc: Eric Biggers <ebiggers@google.com>
Cc: Paul Lawrence <paullawrence@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I38ec011e7931f81341afed6cf24de550234b893b

2021-02-25 15:33:11 +01:00

7.2 KiB

Raw Blame History

View Raw