diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:46:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:46:04 +0200 |
| commit | d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b (patch) | |
| tree | 598ad0f3f4d08240f5879ac0dd801c9257743e22 /include/uapi/linux/android/ssh:/git@git.zx2c4.com | |
| parent | Merge branch 'x86/msr' into x86/core, to resolve conflicts (diff) | |
| parent | x86/nmi: Improve NMI duration console printouts (diff) | |
Merge branch 'x86/nmi' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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