summary refs log tree commit diff
path: root/kernel/sched
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-28 10:12:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-28 10:12:27 -0700
commit965c4b7e1adacd8fd9c5f3db6f64c3ba834ef6a0 (patch)
tree6e930097ed322c9195055a87bfb0879a5d5cb694 /kernel/sched
parentf6167514c819cb7794e60cf36b9466598a789013 (diff)
parent56fb2d6eb63acd48b50437b415b6f7d2fcffe75d (diff)
parent62c61514191bfe5731b43619b9b1bf4b423beeb0 (diff)
parentf5d6d2da0d9098a4aa0ebcc187aa0fc167045d6b (diff)
downloadlinux-965c4b7e1adacd8fd9c5f3db6f64c3ba834ef6a0.tar.gz
Merge branches 'core-urgent-for-linus', 'irq-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool, irq and scheduler fixes from Ingo Molnar:
 "One more objtool fixlet for GCC6 code generation patterns, an irq
  DocBook fix and an unused variable warning fix in the scheduler"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix rare switch jump table pattern detection

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  doc: Add missing parameter for msi_setup

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Remove unused but set variable 'rq'