]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jan 2016 23:44:04 +0000 (15:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jan 2016 23:44:04 +0000 (15:44 -0800)
Pull scheduler fixes from Thomas Gleixner:
 "Three small fixes in the scheduler/core:

   - use after free in the numa code
   - crash in the numa init code
   - a simple spelling fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  pid: Fix spelling in comments
  sched/numa: Fix use-after-free bug in the task_numa_compare
  sched: Fix crash in sched_init_numa()

1  2 
kernel/pid.c
kernel/sched/core.c

diff --cc kernel/pid.c
Simple merge
Simple merge