tree 9dd1b0df3e1c5aeef16e65a99c97008349e73855
parent de3af9a99013fdb0358bb990e9bed0172c65bba9
parent 1b02cd6a2d7f3e2a6a5262887d2cb2912083e42f
author Linus Torvalds <torvalds@linux-foundation.org> 1555779216 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1555779216 -0700

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "A deadline scheduler warning/race fix, and a cfs_period_us quota
  calculation workaround where the real fix looks too involved to merge
  immediately"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/deadline: Correctly handle active 0-lag timers
  sched/fair: Limit sched_cfs_period_timer() loop to avoid hard lockup