diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-11-19 09:31:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-11-19 09:31:55 +0100 |
| commit | 5c16f7ee03c011b0c6cd4c6deccaf0b269d054b2 (patch) | |
| tree | 486398a347143edc22d2f3f042dff21cafd31d74 /include/linux/numa.h | |
| parent | 379e4de9e140850cf699dd390f21ea4b923c955d (diff) | |
| parent | ac5d272a0ad0419f52e08c91953356e32b075af7 (diff) | |
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>
Diffstat (limited to 'include/linux/numa.h')
0 files changed, 0 insertions, 0 deletions