From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 26 Jun 2020 10:24:42 +0000 (+0200)
Subject: Merge branch 'linus' into x86/entry, to resolve conflicts
X-Git-Tag: v5.8-rc3~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c92d787cc9fad57d05c96bd117782183768258a;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus' into x86/entry, to resolve conflicts

Conflicts:
	arch/x86/kernel/traps.c

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

2c92d787cc9fad57d05c96bd117782183768258a