Merge remote-tracking branch 'tmem/linux-next'

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

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

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc arch/x86/xen/smp.c
Simple merge

diff --cc include/xen/interface/xen.h
Simple merge