Pull in tip/sched/core to resolve two merge conflicts:

- 96fd6c65 ("sched: Factor out update_other_load_avgs() from __update_blocked_others()")
  5d871a63 ("sched/fair: Move effective_cpu_util() and effective_cpu_util() in fair.c")

  A simple context conflict. The former added __update_blocked_others() in
  the same #ifdef CONFIG_SMP block that effective_cpu_util() and
  sched_cpu_util() are in and the latter moved those functions to fair.c.
  This makes __update_blocked_others() more out of place. Will follow up
  with a patch to relocate.

- 96fd6c65 ("sched: Factor out update_other_load_avgs() from __update_blocked_others()")
  84d26528 ("sched/pelt: Use rq_clock_task() for hw_pressure")

  The former factored out the body of __update_blocked_others() into
  update_other_load_avgs(). The latter changed how update_hw_load_avg() is
  called in the body. Resolved by applying the change to
  update_other_load_avgs() instead.
Signed-off-by: Tejun Heo <tj@kernel.org>