Merge remote-tracking branch 'tip/auto-latest'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/pgtable.h
Simple merge

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/linux/init_task.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/vmstat.c
Simple merge

diff --cc scripts/kconfig/Makefile
Simple merge