Merge branch 'x86/urgent' into x86/sgx, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 19 Nov 2021 08:31:55 +0000 (09:31 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 19 Nov 2021 08:31:55 +0000 (09:31 +0100)
commit5c16f7ee03c011b0c6cd4c6deccaf0b269d054b2
tree486398a347143edc22d2f3f042dff21cafd31d74
parent379e4de9e140850cf699dd390f21ea4b923c955d
parentac5d272a0ad0419f52e08c91953356e32b075af7
Merge branch 'x86/urgent' into x86/sgx, to resolve conflict

Conflicts:
arch/x86/kernel/cpu/sgx/main.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/sgx/main.c