Skip to content
Commit 2c9e703c authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next 



Conflicts:
	fs/exec.c

Removed IMA changes (the IMA checks are now performed via may_open()).

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parents 6470c077 5805977e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment