Messages in this thread | | | Date | Wed, 03 Jun 2009 03:33:51 -0700 (PDT) | Subject | Re: linux-next: manual merge of the net tree with Linus' tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 3 Jun 2009 12:20:48 +1000
> Hi Dave, > > Today's linux-next merge of the net tree got a conflict in > drivers/net/forcedeth.c between commit > 5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9 ("forcedeth: add phy_power_down > parameter, leave phy powered up by default (v2)") from Linus' tree and > commit 88d7d8b00cdc3117150faab4c4ace6d464b71c22 ("forcedeth: add clock > gating feature <resend>") from the net tree. > > Just context changing. I fixed it up (see below) and can carry the fix > for a while.
This will be fixed with a push I'll do in a few moments.
Thanks Stephen!
| |