* linux-next: manual merge of the sh tree with the tree
@ 2014-01-06 1:13 Stephen Rothwell
2014-01-09 7:11 ` Olof Johansson
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2014-01-06 1:13 UTC (permalink / raw)
To: Paul Mundt, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Bastian Hecht, Laurent Pinchart
[-- Attachment #1: Type: text/plain, Size: 753 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sh tree with the tree
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
0 siblings, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2014-01-09 7:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Mundt, Arnd Bergmann, linux-arm-kernel@lists.infradead.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bastian Hecht, Laurent Pinchart, Simon Horman
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?
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sh tree with the tree
2014-01-09 7:11 ` Olof Johansson
@ 2014-01-10 0:47 ` Simon Horman
2014-01-10 1:55 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Simon Horman @ 2014-01-10 0:47 UTC (permalink / raw)
To: Olof Johansson
Cc: Stephen Rothwell, Paul Mundt, Arnd Bergmann,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Bastian Hecht, Laurent Pinchart
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.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sh tree with the tree
2014-01-10 0:47 ` Simon Horman
@ 2014-01-10 1:55 ` Stephen Rothwell
2014-01-10 2:19 ` Simon Horman
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2014-01-10 1:55 UTC (permalink / raw)
To: Simon Horman
Cc: linux-sh, Olof Johansson, Paul Mundt, Arnd Bergmann,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Bastian Hecht, Laurent Pinchart
[-- Attachment #1: Type: text/plain, Size: 920 bytes --]
Hi all,
On Fri, 10 Jan 2014 09:47:24 +0900 Simon Horman <horms@verge.net.au> wrote:
>
> On Wed, Jan 08, 2014 at 11:11:03PM -0800, Olof Johansson wrote:
> >
> > 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.
That is certainly what it looks like. So, do I remove the sh{,.-current)
trees (git://github.com/pmundt/linux-sh.git#sh-{latest,fixes-for-linus})
from linux-next permanently? Will it be cleaned up any time soon?
Is anyone maintaining/supporting sh now? Is it a candidate for pruning?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sh tree with the tree
2014-01-10 1:55 ` Stephen Rothwell
@ 2014-01-10 2:19 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-01-10 2:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-sh, Olof Johansson, Paul Mundt, Arnd Bergmann,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Bastian Hecht, Laurent Pinchart,
Magnus Damm
[CC Magnus]
On Fri, Jan 10, 2014 at 12:55:29PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 10 Jan 2014 09:47:24 +0900 Simon Horman <horms@verge.net.au> wrote:
> >
> > On Wed, Jan 08, 2014 at 11:11:03PM -0800, Olof Johansson wrote:
> > >
> > > 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.
>
> That is certainly what it looks like. So, do I remove the sh{,.-current)
> trees (git://github.com/pmundt/linux-sh.git#sh-{latest,fixes-for-linus})
> from linux-next permanently? Will it be cleaned up any time soon?
I think that removing it would be a good choice.
> Is anyone maintaining/supporting sh now? Is it a candidate for pruning?
Its a topic of discussion at Renesas. And I hope that someone
will be doing some form of maintenance again soon.
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the sh tree with the tree
@ 2010-08-16 3:00 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-08-16 3:00 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-next, linux-kernel, Sam Ravnborg
Hi Paul,
Today's linux-next merge of the sh tree got a conflict in
arch/sh/include/asm/Kbuild between commit
bf56fba6703592149e1bcd19220c60eb42dff9b7 ("archs: replace unifdef-y with
header-y") from Linus' tree and commit
da28c597996a964a195529595c37f7aacd6dad09 ("sh: split out ptrace header
for _32/_64 variants") from the sh tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/sh/include/asm/Kbuild
index 0eed47b,b4d3462..0000000
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@@ -3,7 -3,10 +3,9 @@@ include include/asm-generic/Kbuild.as
header-y += cachectl.h
header-y += cpu-features.h
header-y += hw_breakpoint.h
-
-unifdef-y += unistd_32.h
-unifdef-y += unistd_64.h
-unifdef-y += posix_types_32.h
-unifdef-y += posix_types_64.h
-unifdef-y += ptrace_32.h
-unifdef-y += ptrace_64.h
+header-y += posix_types_32.h
+header-y += posix_types_64.h
+header-y += unistd_32.h
+header-y += unistd_64.h
++header-y += ptrace_32.h
++header-y += ptrace_64.h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-10 2:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox