From: Simon Horman <horms@verge.net.au>
To: Olof Johansson <olof@lixom.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Paul Mundt <lethal@linux-sh.org>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Bastian Hecht <hechtb@gmail.com>,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Subject: Re: linux-next: manual merge of the sh tree with the tree
Date: Fri, 10 Jan 2014 09:47:24 +0900 [thread overview]
Message-ID: <20140110004724.GA22965@verge.net.au> (raw)
In-Reply-To: <CAOesGMgJe9KR2muA4F9EaXYpDFDLxVZsKOj-8qZFbDZTiRBuww@mail.gmail.com>
On Wed, Jan 08, 2014 at 11:11:03PM -0800, Olof Johansson wrote:
> On Sun, Jan 5, 2014 at 5:13 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Paul,
> >
> > Today's linux-next merge of the sh tree got conflicts in
> > drivers/tty/serial/sh-sci.c and include/linux/serial_sci.h between
> > commits 8fb9631c517b ("serial: sh-sci: Sort headers alphabetically"),
> > 20bdcab8268c ("serial: sh-sci: Add OF support") and probably others from
> > the arm-soc tree and commits ada80ee7fa60 ("serial: sh-sci: Add OF
> > support") and b19ef75c56e9 ("serial: sh-sci: OF definitions need
> > linux/of.h") from the sh tree.
> >
> > The arm-soc tree version is dated much more recently than
> > the sh tree version and conflicts badly, so for today I have just dropped
> > the sh tree (everything in there was committed before April 2013). Please
> > figure this out.
>
> The request to merge the sh code came through Simon with claimed
> agreement from SH maintainers to do so -- I didn't verify this since
> they have in the past been well-coordinated. Simon?
I spoke with Paul recently and my understanding is that
he hasn't been actively working in this area for over a year now.
I guess there are some stale patches in his tree.
next prev parent reply other threads:[~2014-01-10 0:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-06 1:13 linux-next: manual merge of the sh tree with the tree Stephen Rothwell
2014-01-09 7:11 ` Olof Johansson
2014-01-10 0:47 ` Simon Horman [this message]
2014-01-10 1:55 ` Stephen Rothwell
2014-01-10 2:19 ` Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2010-08-16 3:00 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=20140110004724.GA22965@verge.net.au \
--to=horms@verge.net.au \
--cc=arnd@arndb.de \
--cc=hechtb@gmail.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=lethal@linux-sh.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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