]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 99caa3e 1ca07d6)
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)
commit0cfb1931ac38dff88932441e79726a4b9530a7a7
tree9f580b803731bec6b598ec280f56abc6b13e1a97tree | snapshot
parent99caa3ee004e2cdfa7d4a00bdcb510ab7d10e275commit | diff
parent1ca07d6bf3213d145e368f2b7188ea2b7781fc36commit | 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
Linux Kernel Source Tree.