Merge tag 'sched-urgent-2021-06-24' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jun 2021 15:58:23 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jun 2021 15:58:23 +0000 (08:58 -0700)
Pull scheduler fix from Ingo Molnar:
 "A last minute cgroup bandwidth scheduling fix for a recently
  introduced logic fail which triggered a kernel warning by LTP's
  cfs_bandwidth01 test"

* tag 'sched-urgent-2021-06-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Ensure that the CFS parent is added after unthrottling


Trivial merge