linux-next: manual merge of the akpm tree with the driver-core.current tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/printk.c between commit 5becfb1df5ac ("kmsg: merge continuation
records while printing") from the driver-core.current tree and commit
"printk: only look for prefix levels in kernel messages" from the akpm
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc kernel/printk.c
index 104a4ee,04983fc..0000000
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@@ -1496,24 -1453,27 +1495,27 @@@ asmlinkage int vprintk_emit(int facilit
  	/* mark and strip a trailing newline */
  	if (text_len && text[text_len-1] == '\n') {
  		text_len--;
 -		newline = true;
 +		lflags |= LOG_NEWLINE;
  	}
  
- 	/* strip syslog prefix and extract log level or control flags */
- 	kern_level = printk_get_level(text);
- 	if (kern_level) {
- 		const char *end_of_header = printk_skip_level(text);
- 		switch (kern_level) {
- 		case '0' ... '7':
- 			if (level == -1)
- 				level = kern_level - '0';
- 		case 'd':	/* KERN_DEFAULT */
- 			lflags |= LOG_PREFIX;
- 		case 'c':	/* KERN_CONT */
- 			break;
+ 	/* strip kernel syslog prefix and extract log level or control flags */
+ 	if (facility == 0) {
+ 		int kern_level = printk_get_level(text);
+ 
+ 		if (kern_level) {
+ 			const char *end_of_header = printk_skip_level(text);
+ 			switch (kern_level) {
+ 			case '0' ... '7':
+ 				if (level == -1)
+ 					level = kern_level - '0';
+ 			case 'd':	/* KERN_DEFAULT */
 -				prefix = true;
++				lflags |= LOG_PREFIX;
+ 			case 'c':	/* KERN_CONT */
+ 				break;
+ 			}
+ 			text_len -= end_of_header - text;
+ 			text = (char *)end_of_header;
  		}
- 		text_len -= end_of_header - text;
- 		text = (char *)end_of_header;
  	}
  
  	if (level == -1)

Attachment: pgpZ7OZozTjAE.pgp
Description: PGP signature