Merge branch 'sched/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Nov 2018 22:33:00 +0000 (16:33 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Nov 2018 22:33:00 +0000 (16:33 -0600)
commit024d4d4c0cf486dee5240183125edbddc6cf2d55
tree59bdfb85bb91e7dc97580d0e3bd1f24fdf6e4d73
parent1acf93ca6c53144f5ffd408f1820ef5431656eb7
parente1ff516a56ad56c476b47795d3811eef79d25fbe
Merge branch 'sched/urgent' of git://git./linux/kernel/git/tip/tip

Pull scheduler fixes from Thomas Gleixner:
 "Two small scheduler fixes:

   - Take hotplug lock in sched_init_smp(). Technically not really
     required, but lockdep will complain other.

   - Trivial comment fix in sched/fair"

* 'sched/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix a comment in task_numa_fault()
  sched/core: Take the hotplug lock in sched_init_smp()
kernel/sched/core.c