Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes