diff options
| author | Ingo Molnar <[email protected]> | 2025-05-13 08:46:04 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2025-05-13 08:46:04 +0000 |
| commit | d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b (patch) | |
| tree | 598ad0f3f4d08240f5879ac0dd801c9257743e22 /arch/x86/net/bpf_jit_comp.c | |
| parent | Merge branch 'x86/msr' into x86/core, to resolve conflicts (diff) | |
| parent | x86/nmi: Improve NMI duration console printouts (diff) | |
| download | kernel-d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b.tar.gz kernel-d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b.zip | |
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 <[email protected]>
Diffstat (limited to 'arch/x86/net/bpf_jit_comp.c')
0 files changed, 0 insertions, 0 deletions