Messages in this thread | | | Date | Tue, 19 Apr 2011 00:41:08 -0700 (PDT) | Subject | Re: linux-next: manual merge of the net tree with the net-current tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 19 Apr 2011 13:16:18 +1000
> Today's linux-next merge of the net tree got a conflict in > drivers/net/bnx2x/bnx2x_ethtool.c between commit 70dda99c41fc ("bnx2x: > Fix port identification problem") from the net-current tree and commit > 32d3613475d8 ("bnx2x: convert to set_phys_id") from the net tree. > > I fixed it up (maybe - see below) and can carry the fix as necessary.
Your conflict resolution was pretty much perfect :-)
I've merged net-2.6 into net-next-2.6 to fix this up.
Thanks!
| |