diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-03-06 13:00:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-06 13:00:58 +0100 |
| commit | a500fc918f7b8dc3dff2e6c74f3e73e856c18248 (patch) | |
| tree | 9f580b803731bec6b598ec280f56abc6b13e1a97 /include/trace | |
| parent | smp: Micro-optimize smp_call_function_many_cond() (diff) | |
| parent | ath10k: Detect conf_mutex held ath10k_drain_tx() calls (diff) | |
| download | linux-dev-a500fc918f7b8dc3dff2e6c74f3e73e856c18248.tar.xz linux-dev-a500fc918f7b8dc3dff2e6c74f3e73e856c18248.zip | |
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>
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions