Merge branch 'linus' into x86/entry, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Fri, 26 Jun 2020 10:24:42 +0000 (12:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 26 Jun 2020 10:24:42 +0000 (12:24 +0200)
commit2c92d787cc9fad57d05c96bd117782183768258a
tree51c0c567b8be2fd56073a8ce31f8ebd123a7d562
parent145a773aef83181d47ebab21bb33c89233aadb1e
parent8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49
Merge branch 'linus' into x86/entry, to resolve conflicts

Conflicts:
arch/x86/kernel/traps.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/traps.c
include/linux/compiler_types.h