lkml.org 
[lkml]   [2009]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the trivial tree with the net tree
Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/e1000e/lib.c between commit
3bb99fe226ead584a4db674dab546689f705201f ("e1000e: consolidate two dbug
macros into one simpler one") from the net tree and commit
52692d35d013e221137b2fbe800e3e6776111821 ("tree-wide: fix assorted typos
all over the place") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/net/e1000e/lib.c
index f690a10,b065ba4..0000000
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@@ -563,11 -570,11 +563,11 @@@ s32 e1000e_check_for_serdes_link(struc
if (rxcw & E1000_RXCW_SYNCH) {
if (!(rxcw & E1000_RXCW_IV)) {
mac->serdes_has_link = true;
- hw_dbg(hw, "SERDES: Link up - autoneg "
+ e_dbg("SERDES: Link up - autoneg "
- "completed sucessfully.\n");
+ "completed successfully.\n");
} else {
mac->serdes_has_link = false;
- hw_dbg(hw, "SERDES: Link down - invalid"
+ e_dbg("SERDES: Link down - invalid"
"codewords detected in autoneg.\n");
}
} else {


\
 
 \ /
  Last update: 2009-11-24 07:17    [W:2.253 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site