Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/ich8lan.c between commit
30bb0e0dce78427f3e5cb728d6b5ea73acbefffa ("e1000e: fix double release of
mutex") from the net-current tree and commit
0285c8dcaeaa73ddadc4f38383e5bbc03c394a29 ("e1000e: cosmetic newline in
debug message") from the net tree.
Trivial context overlap. I fixed it up (see below) and will carry as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/e1000e/ich8lan.c
index d115a6d,92f2ace..0000000
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@@ -1893,8 -1939,7 +1939,8 @@@ static s32 e1000_reset_hw_ich8lan(struc
ctrl |= E1000_CTRL_PHY_RST;
}
ret_val = e1000_acquire_swflag_ich8lan(hw);
+ /* Whether or not the swflag was acquired, we need to reset the part */
- hw_dbg(hw, "Issuing a global reset to ich8lan");
+ hw_dbg(hw, "Issuing a global reset to ich8lan\n");
ew32(CTRL, (ctrl | E1000_CTRL_RST));
msleep(20);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
