]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb2365f 8960962)
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)
commit39d28b28e138be4f2eea012aea884bf98ee00d6d
treea6542c021c3d3b78c5618319bc3b4a6aefa3f0e7tree | snapshot
parentcb2365f3eb6d5eef712b20610bfda1635bd2f39ecommit | diff
parent8960962fcc9646a07cb811ee6b43cde0f08c2b55commit | 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.