From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 18:22:12 +0000 (-0800)
Subject: Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.14-rc1~176
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=897aea303fec0c24b2a21b8e29f45dc73a234555;p=cascardo%2Flinux.git

Merge branch 'core-debug-for-linus' of git://git./linux/kernel/git/tip/tip

Pull core debug changes from Ingo Molnar:
 "Currently there are two methods to set the panic_timeout: via
  'panic=X' boot commandline option, or via /proc/sys/kernel/panic.

  This tree adds a third panic_timeout configuration method:
  configuration via Kconfig, via CONFIG_PANIC_TIMEOUT=X - useful to
  distros that generally want their kernel defaults to come with the
  .config.

  CONFIG_PANIC_TIMEOUT defaults to 0, which was the previous default
  value of panic_timeout.

  Doing that unearthed a few arch trickeries regarding arch-special
  panic_timeout values and related complications - hopefully all
  resolved to the satisfaction of everyone"

* 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  powerpc: Clean up panic_timeout usage
  MIPS: Remove panic_timeout settings
  panic: Make panic_timeout configurable
---

897aea303fec0c24b2a21b8e29f45dc73a234555