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

From: David Miller <[email-masked]>
Date: Thu, 01 Mar 2012 17:24:27 -0500 (EST)

From: Stephen Rothwell <[email-masked]>
Date: Thu, 1 Mar 2012 13:33:33 +1100

> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/broadcom/tg3.c between commit 65ec698d1368 ("tg3:
> Fix tg3_get_stats64 for 5700 / 5701 devs") from the net tree and various
> commits from the net-next tree.
> 
> I just used the version from the net-next tree for today (assuming that
> this conflict will be fixed shortly).

I'll try to take care of this now, thanks Stephen.