Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

linux-next: manual merge of the microblaze tree with Linus' tree

2 views
Skip to first unread message

Stephen Rothwell

unread,
Feb 8, 2010, 7:10:02 PM2/8/10
to
Hi Michal,

Today's linux-next merge of the microblaze tree got a conflict in
arch/microblaze/kernel/setup.c between commit
a6013411118a6c8c34f1bd8b047b36fdf9711590 ("microblaze: Invalidate dcache
before enabling it") from Linus' tree and commit
578059c56c816db2b696a196d3656afc187c7edd ("microblaze: Move cache
function to cache.c") from the microblaze tree.

The microblaze tree version supercedes the version from Linus' tree, so I
used that.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Michal Simek

unread,
Feb 9, 2010, 3:30:01 AM2/9/10
to
Stephen Rothwell wrote:
> Hi Michal,
>
> Today's linux-next merge of the microblaze tree got a conflict in
> arch/microblaze/kernel/setup.c between commit
> a6013411118a6c8c34f1bd8b047b36fdf9711590 ("microblaze: Invalidate dcache
> before enabling it") from Linus' tree and commit
> 578059c56c816db2b696a196d3656afc187c7edd ("microblaze: Move cache
> function to cache.c") from the microblaze tree.
>
> The microblaze tree version supercedes the version from Linus' tree, so I
> used that.

Yes, I know about. I am fixing it.

Thanks,
Michal


--
Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Stephen Rothwell

unread,
Feb 9, 2010, 5:50:02 AM2/9/10
to
Hi Michal,

On Tue, 09 Feb 2010 09:18:39 +0100 Michal Simek <michal...@petalogix.com> wrote:
>
> Yes, I know about. I am fixing it.

Great, thanks.

0 new messages