lkml.org 
[lkml]   [2011]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the m68knommu tree with the m68k tree
Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/Kconfig.debug between commit 049755db2c3f ("m68k/mvme16x: Add
support for EARLY_PRINTK") from the m68k tree and commit d0106cf0aa29
("m68k: support configure time command line for MMU m68k") from the
m68knommu tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc arch/m68k/Kconfig.debug
index a0c8863,af4fd5f..0000000
--- a/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@@ -2,17 -2,14 +2,25 @@@ menu "Kernel hacking

source "lib/Kconfig.debug"

+config EARLY_PRINTK
+ bool "Early printk" if EMBEDDED
+ depends on MVME16x || MAC
+ default y
+ help
+ Write kernel log output directly to a serial port.
+
+ This is useful for kernel debugging when your machine crashes very
+ early before the console code is initialized.
+ You should normally say N here, unless you want to debug such a crash.
+
+ config BOOTPARAM
+ bool 'Compiled-in Kernel Boot Parameter'
+
+ config BOOTPARAM_STRING
+ string 'Kernel Boot Parameter'
+ default 'console=ttyS0,19200'
+ depends on BOOTPARAM
+
if !MMU

config FULLDEBUG
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-11-14 01:05    [W:0.020 / U:1.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site