From: Ingo Molnar Date: Fri, 4 Dec 2015 09:30:35 +0000 (+0100) Subject: Merge branch 'sched/urgent' into locking/core, to pick up scheduler fix we rely on X-Git-Tag: v4.5-rc1~172^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829cf31751aa1c50b1527c1e0c821c99246b5639;p=thirdparty%2Fkernel%2Flinux.git 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 --- 829cf31751aa1c50b1527c1e0c821c99246b5639