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