From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Finn Thain <fthain@telegraphics.com.au>,
Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the tty tree with the m68k tree
Date: Tue, 27 May 2014 16:53:37 +1000 [thread overview]
Message-ID: <20140527165337.5c7d4fa4@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-05-27 6:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 6:53 Stephen Rothwell [this message]
2014-05-27 15:30 ` linux-next: manual merge of the tty tree with the m68k tree Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140527165337.5c7d4fa4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=fthain@telegraphics.com.au \
--cc=geert@linux-m68k.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox