]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e4dbe02 b1bbd19)
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)
commit0b5b1ec17556b038e771459e7c08bbeda2ed516e
tree9f580b803731bec6b598ec280f56abc6b13e1a97tree | snapshot
parente4dbe024542cc43ca01bcc64c6286839fb9e1d3bcommit | diff
parentb1bbd19064bb1733618ae2d7124ad9001ff52a25commit | 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.