git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d43f17a bdb1050)
Merge branch 'locking/core' into x86/mm, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Sat, 6 Mar 2021 12:00:58 +0000 (13:00 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 6 Mar 2021 12:00:58 +0000 (13:00 +0100)
commita500fc918f7b8dc3dff2e6c74f3e73e856c18248
tree9f580b803731bec6b598ec280f56abc6b13e1a97tree
parentd43f17a1da25373580ebb466de7d0641acbf6fd6commit | diff
parentbdb1050ee1faaec1e78c15de8b1959176f26c655commit | 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>
kernel/smp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.