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,
Chris Metcalf <cmetcalf@tilera.com>,
Srinivas Kandagatla <srinivas.kandagatla@st.com>
Subject: Re: linux-next: manual merge of the tty tree with the tile tree
Date: Mon, 12 Aug 2013 23:12:56 -0700 [thread overview]
Message-ID: <20130813061256.GA9854@kroah.com> (raw)
In-Reply-To: <20130813154346.fb2e52f791fb6e2e3e2fbfcc@canb.auug.org.au>
On Tue, Aug 13, 2013 at 03:43:46PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> include/uapi/linux/serial_core.h between commit 002abee2d681 ("tilegx:
> Add tty serial support for TILE-Gx on-chip UART") from the tile tree and
> commit c4b058560762 ("serial:st-asc: Add ST ASC driver") from the tty
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks fine to me, thanks.
greg k-h
prev parent reply other threads:[~2013-08-13 6:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 5:43 linux-next: manual merge of the tty tree with the tile tree Stephen Rothwell
2013-08-13 6:12 ` 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=20130813061256.GA9854@kroah.com \
--to=greg@kroah.com \
--cc=cmetcalf@tilera.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=srinivas.kandagatla@st.com \
/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;
as well as URLs for NNTP newsgroup(s).