Merge tag 'for_linux-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwess...

Pull kgdb/kdb updates from Jason Wessel:
 "KGDB/KDB New:
   - KDB: improved searching
   - No longer enter debug core on panic if panic timeout is set

  KGDB/KDB regressions / cleanups
   - fix pdf doc build errors
   - prevent junk characters on kdb console from printk levels"

* tag 'for_linux-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  kgdb, docs: Fix <para> pdfdocs build errors
  debug: prevent entering debug mode on panic/exception.
  kdb: Const qualifier for kdb_getstr's prompt argument
  kdb: Provide forward search at more prompt
  kdb: Fix a prompt management bug when using | grep
  kdb: Remove stack dump when entering kgdb due to NMI
  kdb: Avoid printing KERN_ levels to consoles
  kdb: Fix off by one error in kdb_cpu()
  kdb: fix incorrect counts in KDB summary command output

diff --cc Documentation/DocBook/kgdb.tmpl
index 2428cc04dbc84b5f7243558296f6f36fa9621fb4,efca2a418d5bfcc06163d42945c805d63cc766fe..f3abca7ec53d62e4bd416da9f53395aef9269855
--- 1/Documentation/DocBook/kgdb.tmpl
--- 2/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
@@@ -350,8 -353,9 +350,9 @@@
     </para>
     </listitem>
     </orderedlist>
+   </para>
     <para>IMPORTANT NOTE: You cannot use kgdboc + kgdbcon on a tty that is an
 -   active system console.  An example incorrect usage is <constant>console=ttyS0,115200 kgdboc=ttyS0 kgdbcon</constant>
 +   active system console.  An example of incorrect usage is <constant>console=ttyS0,115200 kgdboc=ttyS0 kgdbcon</constant>
     </para>
     <para>It is possible to use this option with kgdboc on a tty that is not a system console.
     </para>

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