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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpW2d0XaL9JW.pgp
Description: PGP signature
