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

From: David Miller <[email-masked]>
Date: Sun, 22 Mar 2009 21:17:20 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Mon, 23 Mar 2009 14:50:01 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
> 574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
> net_device_ops") from the infiniband tree and commit
> fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
> net_device_ops") from the net tree.
> 
> Again different versions of the same change.  I used the net tree version.

I'll work with Roland to resolve these somehow, thanks.