Merge tag 'v3.17-rc4' into sched/core, to prevent conflicts with upcoming patches...