From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 15 Mar 2022 11:50:49 +0000 (+0100)
Subject: Merge branch 'x86/pasid' into x86/core, to resolve conflicts
X-Git-Tag: v5.18-rc1~94^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c490b42fe91c10d5756efe56014240c669e7720;p=thirdparty%2Fkernel%2Flinux.git

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>
---

8c490b42fe91c10d5756efe56014240c669e7720