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

From: David Miller <[email-masked]>
Date: Thu, 27 Nov 2008 00:03:49 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
Date: Thu, 27 Nov 2008 14:40:43 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/hp-plus.c between commit
> 1d71da164d7fb40fac72c0406a4a531265916fc8 ("net: hp-plus uses eip_poll")
> from the net-current tree and commit
> d4a97d425c2f59849ebdcc94281ecf108818efbf ("hp-plus: convert to
> net_device_ops") from the net tree.
> 
> The fixed it up (see below) but assume it will be fixed soon in the net
> tree.

Thanks Stephen.

I just merged net-2.6 into net-next-2.6 to clear up all of these
merge and build hassles.