linux-next: manual merge of the net tree with Linus' tree

[Stephen Rothwell]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/forcedeth.c
index 9f6a68f,d0b1d9f..0000000
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@@ -5522,7 -5534,8 +5543,8 @@@ static int nv_close(struct net_device *
  
  	nv_drain_rxtx(dev);
  
 -	if (np->wolenabled) {
 +	if (np->wolenabled || !phy_power_down) {
+ 		nv_txrx_gate(dev, false);
  		writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
  		nv_start_rx(dev);
  	} else {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/