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/uapi/git:/ssh:/git@git.zx2c4.com | |
| parent | x86/sgx: Fix minor documentation issues (diff) | |
| parent | x86/sgx: Fix free page accounting (diff) | |
| download | linux-dev-5c16f7ee03c011b0c6cd4c6deccaf0b269d054b2.tar.xz linux-dev-5c16f7ee03c011b0c6cd4c6deccaf0b269d054b2.zip | |
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/uapi/git:/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions