Merge branches 'fixes' and 'misc' into for-linus

arch/arm/Kconfig

arch/arm/include/asm/bitops.h

arch/arm/include/asm/ftrace.h

arch/arm/include/asm/page-nommu.h

arch/arm/kernel/entry-ftrace.S

arch/arm/kernel/ftrace.c

arch/arm/kernel/process.c

arch/arm/kernel/vdso.c

arch/arm/mm/Kconfig

arch/x86/entry/vdso/vma.c

mm/mmap.c