Merge branch 'linus' into x86/urgent

Required to queue a dependent fix.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge