diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-06 15:00:58 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-06 15:00:58 +0300 |
| commit | a500fc918f7b8dc3dff2e6c74f3e73e856c18248 (patch) | |
| tree | 9f580b803731bec6b598ec280f56abc6b13e1a97 /net/nfc/nci/uart.c | |
| parent | d43f17a1da25373580ebb466de7d0641acbf6fd6 (diff) | |
| parent | bdb1050ee1faaec1e78c15de8b1959176f26c655 (diff) | |
| download | linux-a500fc918f7b8dc3dff2e6c74f3e73e856c18248.tar.xz | |
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 'net/nfc/nci/uart.c')
0 files changed, 0 insertions, 0 deletions