diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-19 08:18:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-19 08:18:56 +0200 |
| commit | 177bfd725bd1b67c7254248cf19f0465d493e631 (patch) | |
| tree | 7073a8014605640de923b52a040f86915c16612d /arch/x86/kernel/cpu/common.c | |
| parent | x86/CPU: Move x86_cpuinfo::x86_max_cores assignment to detect_num_cpu_cores() (diff) | |
| parent | x86/apic/x2apic: Initialize cluster ID properly (diff) | |
| parent | objtool: Detect RIP-relative switch table references, part 2 (diff) | |
| download | linux-177bfd725bd1b67c7254248cf19f0465d493e631.tar.xz linux-177bfd725bd1b67c7254248cf19f0465d493e631.zip | |
Merge branches 'x86/urgent' and 'core/urgent' into x86/boot, to pick up fixes and avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>