From: Harvey Harrison <harvey.harrison@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the cris tree
Date: Thu, 15 Jan 2009 18:51:24 -0800 [thread overview]
Message-ID: <1232074284.5786.0.camel@brick> (raw)
In-Reply-To: <20090116111127.3fc8dbd9.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2009-01-16 2:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-16 0:11 linux-next: manual merge of the cris tree Stephen Rothwell
2009-01-16 2:51 ` Harvey Harrison [this message]
2009-01-17 1:00 ` Jesper Nilsson
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=1232074284.5786.0.camel@brick \
--to=harvey.harrison@gmail.com \
--cc=jesper.nilsson@axis.com \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.