Messages in this thread | | | Date | Mon, 2 Jul 2012 16:39:59 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in kernel/printk.c between commit 084681d14e42 ("printk: flush continuation lines immediately to console") from Linus' tree and commit "printk: add generic functions to find KERN_<LEVEL> headers" from the akpm 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 kernel/printk.c index a6f19ef,f591849..0000000 --- a/kernel/printk.c +++ b/kernel/printk.c @@@ -1399,6 -1301,11 +1399,7 @@@ asmlinkage int vprintk_emit(int facilit const char *fmt, va_list args) { static int recursion_bug; - static char cont_buf[LOG_LINE_MAX]; - static size_t cont_len; - static int cont_level; + int kern_level; - static struct task_struct *cont_task; static char textbuf[LOG_LINE_MAX]; char *text = textbuf; size_t text_len; [unhandled content-type:application/pgp-signature] | |