From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Gabor Juhos <juhosg@openwrt.org>,
Ralf Baechle <ralf@linux-mips.org>, Rong Wang <Rong.Wang@csr.com>
Subject: Re: linux-next: manual merge of the tty tree with the mips tree
Date: Fri, 18 Nov 2011 08:19:18 -0800 [thread overview]
Message-ID: <20111118161918.GC30462@kroah.com> (raw)
In-Reply-To: <20111118142245.5f4156be67f6048f58595b0d@canb.auug.org.au>
On Fri, Nov 18, 2011 at 02:22:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/Makefile between commit 58235d376b15 ("SERIAL: AR933X:
> Add driver for the built-in UART of the SoC") from the mips tree and
> commit 161e773cbd0c ("UART: add CSR SiRFprimaII SoC on-chip uart
> drivers") from the tty tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks fine, thanks.
greg k-h
next prev parent reply other threads:[~2011-11-18 16:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-18 3:22 linux-next: manual merge of the tty tree with the mips tree Stephen Rothwell
2011-11-18 16:19 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-09 10:59 Stephen Rothwell
2015-06-09 21:10 ` Greg KH
2016-05-02 5:52 Stephen Rothwell
2016-05-02 15:28 ` 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=20111118161918.GC30462@kroah.com \
--to=greg@kroah.com \
--cc=Rong.Wang@csr.com \
--cc=juhosg@openwrt.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ralf@linux-mips.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.