Subject: linux-next: manual merge of the tty tree with the m68k tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 27 May 2014 16:53:37 +1000

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
Documentation/kernel-parameters.txt between commit d5ebf7cc86a7 ("m68k:
Multi-platform EARLY_PRINTK") from the m68k tree and commit
0d3c673e7881 ("tty/serial: pl011: add generic earlycon support") from
the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).  Thanks Geert for the heads up.

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc Documentation/kernel-parameters.txt
index 73368ca1339c,4946d8e58d53..000000000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -910,7 -893,15 +911,15 @@@ bytes respectively. Such letter suffixe
  			(mmio) or 32-bit (mmio32).
  			The options are the same as for ttyS, above.
  
+ 		pl011,<addr>
+ 			Start an early, polled-mode console on a pl011 serial
+ 			port at the specified address. The pl011 serial port
+ 			must already be setup and configured. Options are not
+ 			yet supported.
+ 
+ 		smh	Use ARM semihosting calls for early console.
+ 
 -	earlyprintk=	[X86,SH,BLACKFIN,ARM]
 +	earlyprintk=	[X86,SH,BLACKFIN,ARM,M68k]
  			earlyprintk=vga
  			earlyprintk=efi
  			earlyprintk=xen