Merge branch 'master' into next

Conflicts:
	fs/exec.c

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

Signed-off-by: James Morris <jmorris@namei.org>

diff --cc fs/exec.c
Simple merge

diff --cc fs/hugetlbfs/inode.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge