Merge branch 'x86/pasid' into x86/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 15 Mar 2022 11:50:49 +0000 (12:50 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 15 Mar 2022 11:50:59 +0000 (12:50 +0100)
commit8c490b42fe91c10d5756efe56014240c669e7720
tree305c483f5d51cf9866ab4c75282da89d333247c1
parentaaeed6ecc1253ce1463fa1aca0b70a4ccbc9fa75
parent83aa52ffed5d35a08e24452d0471e1684075cdf8
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>
arch/x86/kernel/traps.c
drivers/iommu/intel/iommu.c
include/linux/mm_types.h
kernel/fork.c