* linux-next: manual merge of the tty tree with the m68k tree
@ 2014-05-27 6:53 Stephen Rothwell
2014-05-27 15:30 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-05-27 6:53 UTC (permalink / raw)
To: Greg KH, Geert Uytterhoeven
Cc: linux-next, linux-kernel, Finn Thain, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]
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 sfr@canb.auug.org.au
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tty tree with the m68k tree
2014-05-27 6:53 linux-next: manual merge of the tty tree with the m68k tree Stephen Rothwell
@ 2014-05-27 15:30 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2014-05-27 15:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Geert Uytterhoeven, linux-next, linux-kernel, Finn Thain,
Rob Herring
On Tue, May 27, 2014 at 04:53:37PM +1000, Stephen Rothwell wrote:
> 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.
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-27 15:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-27 6:53 linux-next: manual merge of the tty tree with the m68k tree Stephen Rothwell
2014-05-27 15:30 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox