Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git

# Conflicts:
#	drivers/misc/lkdtm/stackleak.c