arch/x86/kernel/cpu/sgx/main.c · 5c16f7ee03c011b0c6cd4c6deccaf0b269d054b2 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branch 'x86/urgent' into x86/sgx, to resolve conflict · 5c16f7ee
Ingo Molnar authored Nov 19, 2021
```
Conflicts:
	arch/x86/kernel/cpu/sgx/main.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
5c16f7ee

main.c 23.6 KB