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

From: Stephen Rothwell <redacted>
Date: Wed, 9 Feb 2011 11:56:09 +1100

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/netdev.c between commit
463342741222c79469303cdab8ce99c8bc2d80e8 ("e1000e: tx_timeout should not
increment for non-hang events") from the net-current tree and commit
90da06692532541a38f9857972e1fd6b1cdfb45a ("e1000e: reduce scope of some
variables, remove unnecessary ones") from the net tree.

I fixed it up (see below) and can carry the fix as necessary.

I'll do a merge to clear this up, thanks Stephen.