Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus

crypto/asymmetric_keys/pkcs7_key_type.c

@@ -62,7 +62,7 @@ static int pkcs7_preparse(struct key_preparsed_payload *prep)
 
 	return verify_pkcs7_signature(NULL, 0,
 				      prep->data, prep->datalen,
-				      NULL, usage,
+				      (void *)1UL, usage,
 				      pkcs7_view_content, prep);
 }