| commit | a500fc918f7b8dc3dff2e6c74f3e73e856c18248 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sat Mar 06 13:00:58 2021 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sat Mar 06 13:00:58 2021 +0100 |
| tree | 9f580b803731bec6b598ec280f56abc6b13e1a97 | |
| parent | d43f17a1da25373580ebb466de7d0641acbf6fd6 [diff] | |
| parent | bdb1050ee1faaec1e78c15de8b1959176f26c655 [diff] |
Merge branch 'locking/core' into x86/mm, to resolve conflict There's a non-trivial conflict between the parallel TLB flush framework and the IPI flush debugging code - merge them manually. Conflicts: kernel/smp.c Signed-off-by: Ingo Molnar <mingo@kernel.org>