Merge tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jun 2021 22:37:49 +0000 (15:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jun 2021 22:37:49 +0000 (15:37 -0700)
commita6eaf3850cb171c328a8b0db6d3c79286a1eba9d
tree2cef5ef9d0c7ae61caba1c9d25c80b6c6d6c1254
parentf4cc74c9382d8b02181cfdc6d29ee5bc7a1f7d02
parenta22a5cb81e20657194fde6c835e07d28c4dfddbe
Merge tag 'sched-urgent-2021-06-30' of git://git./linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:

 - Fix a small inconsistency (bug) in load tracking, caught by a new
   warning that several people reported.

 - Flip CONFIG_SCHED_CORE to default-disabled, and update the Kconfig
   help text.

* tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/core: Disable CONFIG_SCHED_CORE by default
  sched/fair: Ensure _sum and _avg values stay consistent
kernel/sched/fair.c