]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f5b6a54 179189f)
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)
commit8ca0b519e558554f459a675e9267a07e462ff788
treea6542c021c3d3b78c5618319bc3b4a6aefa3f0e7tree | snapshot
parentf5b6a546a7ca67df96ecd5bf8601b9f8bbf33614commit | diff
parent179189f9e7cd462bf07473b4ca6400bdef60bc17commit | 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>
Linux Kernel Source Tree.