From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jesper Nilsson <jesper.nilsson@axis•com>
Cc: linux-next@vger•kernel.org, Harvey Harrison <harvey.harrison@gmail•com>
Subject: linux-next: manual merge of the cris tree
Date: Fri, 16 Jan 2009 11:11:27 +1100 [thread overview]
Message-ID: <20090116111127.3fc8dbd9.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2009-01-16 0:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-16 0:11 Stephen Rothwell [this message]
2009-01-16 2:51 ` linux-next: manual merge of the cris tree Harvey Harrison
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=20090116111127.3fc8dbd9.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=harvey.harrison@gmail$(echo .)com \
--cc=jesper.nilsson@axis$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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