Merge branch 'x86/pasid' into x86/core, to resolve conflicts

Conflicts:
	tools/objtool/arch/x86/decode.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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

diff --cc drivers/iommu/intel/iommu.c
Simple merge

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

diff --cc kernel/fork.c
Simple merge