projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit829cf31751aa1c50b1527c1e0c821c99246b5639
treea6542c021c3d3b78c5618319bc3b4a6aefa3f0e7tree | snapshot (tar.gz zip)
parentd78045306c41bd9334b956e4e7fa77cc72f06a40commit | diff
parentecf7d01c229d11a44609c0067889372c91fb4f36commit | diff
Merge branch 'sched/urgent' into locking/core, to pick up scheduler fix we rely on

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>