From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Finn Thain <fthain@telegraphics.com.au>,
Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the m68k tree
Date: Tue, 27 May 2014 08:30:34 -0700 [thread overview]
Message-ID: <20140527153034.GA20250@kroah.com> (raw)
In-Reply-To: <20140527165337.5c7d4fa4@canb.auug.org.au>
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
prev parent reply other threads:[~2014-05-27 15:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20140527153034.GA20250@kroah.com \
--to=greg@kroah.com \
--cc=fthain@telegraphics.com.au \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sfr@canb.auug.org.au \
/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