* linux-next: manual merge of the cris tree
@ 2009-01-16 0:11 Stephen Rothwell
2009-01-16 2:51 ` Harvey Harrison
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-01-16 0:11 UTC (permalink / raw)
To: Jesper Nilsson; +Cc: linux-next, Harvey Harrison
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
Hi Jesper,
Today's linux-next merge of the cris tree got a conflict in
arch/cris/include/arch-v32/arch/byteorder.h between commit
aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd ("cris: introduce asm/swab.h")
from Linus' tree and commit 0db42c6b23ce26b05b235dbe2e0aa096db194e33
("cris: use the new byteorder headers") from the cris tree.
There was also conflicts in arch/cris/include/asm/byteorder.h.
I have dropped the cris tree for today. You should do a merge with
Linus' tree and fix these conflicts.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the cris tree
2009-01-16 0:11 linux-next: manual merge of the cris tree Stephen Rothwell
@ 2009-01-16 2:51 ` Harvey Harrison
2009-01-17 1:00 ` Jesper Nilsson
0 siblings, 1 reply; 3+ messages in thread
From: Harvey Harrison @ 2009-01-16 2:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jesper Nilsson, linux-next
On Fri, 2009-01-16 at 11:11 +1100, Stephen Rothwell wrote:
> Hi Jesper,
>
> Today's linux-next merge of the cris tree got a conflict in
> arch/cris/include/arch-v32/arch/byteorder.h between commit
> aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd ("cris: introduce asm/swab.h")
> from Linus' tree and commit 0db42c6b23ce26b05b235dbe2e0aa096db194e33
> ("cris: use the new byteorder headers") from the cris tree.
>
> There was also conflicts in arch/cris/include/asm/byteorder.h.
>
> I have dropped the cris tree for today. You should do a merge with
> Linus' tree and fix these conflicts.
Linus wanted a slightly different approach for the byteorder headers,
so the patch in the cris tree is now outdated. Please drop it.
Cheers,
Harvey
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the cris tree
2009-01-16 2:51 ` Harvey Harrison
@ 2009-01-17 1:00 ` Jesper Nilsson
0 siblings, 0 replies; 3+ messages in thread
From: Jesper Nilsson @ 2009-01-17 1:00 UTC (permalink / raw)
To: Harvey Harrison; +Cc: Stephen Rothwell, linux-next@vger.kernel.org
On Fri, Jan 16, 2009 at 03:51:24AM +0100, Harvey Harrison wrote:
> On Fri, 2009-01-16 at 11:11 +1100, Stephen Rothwell wrote:
> > Hi Jesper,
> >
> > Today's linux-next merge of the cris tree got a conflict in
> > arch/cris/include/arch-v32/arch/byteorder.h between commit
> > aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd ("cris: introduce asm/swab.h")
> > from Linus' tree and commit 0db42c6b23ce26b05b235dbe2e0aa096db194e33
> > ("cris: use the new byteorder headers") from the cris tree.
> >
> > There was also conflicts in arch/cris/include/asm/byteorder.h.
> >
> > I have dropped the cris tree for today. You should do a merge with
> > Linus' tree and fix these conflicts.
>
> Linus wanted a slightly different approach for the byteorder headers,
> so the patch in the cris tree is now outdated. Please drop it.
Ok, I've dropped it. Thanks for the heads up.
> Cheers,
>
> Harvey
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-01-17 1:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-16 0:11 linux-next: manual merge of the cris tree Stephen Rothwell
2009-01-16 2:51 ` Harvey Harrison
2009-01-17 1:00 ` Jesper Nilsson
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).