From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"\"André Goddard Rosa\"" <andre.goddard@gmail.com>,
"Bruce Allan" <bruce.w.allan@intel.com>,
"David S. Miller" <davem@davemloft.net>
Subject: linux-next: manual merge of the trivial tree with the net tree
Date: Tue, 24 Nov 2009 17:14:59 +1100 [thread overview]
Message-ID: <20091124171459.88cb0c0d.sfr@canb.auug.org.au> (raw)
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 {
next reply other threads:[~2009-11-24 6:14 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 6:14 Stephen Rothwell [this message]
2009-11-24 9:13 ` Jiri Kosina
2009-11-30 1:13 ` David Miller
2009-11-30 2:53 Stephen Rothwell
2009-11-30 12:36 ` Jiri Kosina
2009-11-30 19:55 ` Stephen Rothwell
2010-02-03 2:30 Stephen Rothwell
2010-02-03 10:39 ` Jiri Kosina
2010-02-04 4:04 ` David Miller
2010-02-04 9:52 ` Jiri Kosina
2010-02-04 12:50 ` Giuseppe CAVALLARO
2010-02-04 13:52 ` Giuseppe CAVALLARO
2010-02-04 17:33 ` David Miller
2010-02-05 2:37 Stephen Rothwell
2010-02-05 4:26 ` David Miller
2010-02-05 8:39 ` Jiri Kosina
2010-02-05 11:23 ` Jiri Kosina
2010-02-05 16:55 ` David Miller
2010-02-16 3:50 Stephen Rothwell
2010-02-24 5:21 Stephen Rothwell
2010-09-24 2:19 Stephen Rothwell
2010-09-24 12:09 ` Jiri Kosina
2010-10-12 0:53 Stephen Rothwell
2011-01-04 3:22 Stephen Rothwell
2011-01-05 14:51 ` Jiri Kosina
2011-01-05 15:22 ` Justin P. Mattock
2011-07-22 4:18 Stephen Rothwell
2011-07-22 6:42 ` Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091124171459.88cb0c0d.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andre.goddard@gmail.com \
--cc=bruce.w.allan@intel.com \
--cc=davem@davemloft.net \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®