Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Mon, 10 Nov 2008 23:00:49 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
Date: Mon, 10 Nov 2008 14:02:53 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/message/fusion/mptlan.c between commit
> 54e7ff9d6249ba88e393d7fbc8008da9279723be ("trivial: MPT fusion - remove
> long dead code") from Linus' tree and commit
> 7c510e4b730a92cecf94ada45c989d8be0200d47 ("net: convert more to %pM")
> from the net tree.
> 
> The former just removed some of the code that the latter modified.  I
> have removed the code and expect the ocnflict will be fixed in your tree
> soon.

Thanks for the heads up.  There will be even more conflicts,
between net-2.6 and net-next-2.6, that will need resolving
as well.

I hope to have this resolved within the next day.