From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>,
Simon Horman <horms+renesas@verge.net.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the sh tree
Date: Tue, 1 Oct 2013 06:53:36 -0700 [thread overview]
Message-ID: <20131001135336.GB19805@kroah.com> (raw)
In-Reply-To: <1380625644-11331-7-git-send-email-treding@nvidia.com>
On Tue, Oct 01, 2013 at 01:07:23PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the sh tree got conflicts in
>
> arch/sh/kernel/cpu/sh2a/Makefile
> drivers/tty/serial/sh-sci.c
> include/linux/serial_sci.h
>
> I fixed them up (see below). Please check if the resolution looks correct.
Looks correct to me, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2013-10-01 13:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the bcon tree Thierry Reding
2013-10-01 14:26 ` Jörn Engel
2013-10-01 11:07 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the cgroup tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the driver-core tree Thierry Reding
2013-10-01 13:54 ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-01 11:29 ` Theodore Ts'o
2013-10-01 11:07 ` linux-next: manual merge of the sh tree Thierry Reding
2013-10-01 13:53 ` Greg Kroah-Hartman [this message]
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the sh tree Thierry Reding
2008-10-16 23:54 Stephen Rothwell
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=20131001135336.GB19805@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=horms+renesas@verge.net.au \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thierry.reding@gmail.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).