lkml.org 
[lkml]   [2012]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2012-07-02 09:22    [W:0.027 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site