linux-kernel - Re: linux-next: manual merge of the sh tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140110004724.GA22965@verge.net.au>
Date:	Fri, 10 Jan 2014 09:47:24 +0900
From:	Simon Horman <horms@...ge.net.au>
To:	Olof Johansson <olof@...om.net>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Paul Mundt <lethal@...ux-sh.org>,
	Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Bastian Hecht <hechtb@...il.com>,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>
Subject: Re: linux-next: manual merge of the sh tree with the tree

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@...b.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/