Conflicts:
	security/Kconfig

Manual fix.
Signed-off-by: NJames Morris <jmorris@namei.org>