projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d780453 ecf7d01)
Merge branch 'sched/urgent' into locking/core, to pick up scheduler fix we rely on
authorIngo Molnar <mingo@kernel.org>
Fri, 4 Dec 2015 09:30:35 +0000 (10:30 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 4 Dec 2015 09:30:35 +0000 (10:30 +0100)
So we want to change a locking API, but the scheduler uses it, and a conflict
is generated by a recent scheduler fix.

Pick up the pending scheduler fixes to make life easier.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge