Conflicts:
	security/integrity/evm/evm_crypto.c

Resolved upstream fix vs. next conflict manually.
Signed-off-by: NJames Morris <jmorris@namei.org>