diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:39:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:39:22 +0200 |
| commit | 34be751998c1407a460efe3a20f9c4ddb8c82b9f (patch) | |
| tree | e6b55b0ee269828b0cb63c67039c094ef0f407dc /include/uapi/linux/android/ssh:/git@git.zx2c4.com | |
| parent | Merge branch 'x86/microcode' into x86/core, to merge dependent commits (diff) | |
| parent | x86/devmem: Remove duplicate range_is_allowed() definition (diff) | |
Merge branch 'x86/mm' into x86/core, to resolve conflicts
Conflicts:
arch/x86/mm/numa.c
arch/x86/mm/pgtable.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/android/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions