From: Jiri Kosina <jkosina@suse•cz>
To: Stephen Rothwell <sfr@canb•auug.org.au>
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: Re: linux-next: manual merge of the trivial tree with the net tree
Date: Tue, 24 Nov 2009 10:13:47 +0100 (CET) [thread overview]
Message-ID: <alpine.LSU.2.00.0911241011520.6953@wotan.suse.de> (raw)
In-Reply-To: <20091124171459.88cb0c0d.sfr@canb.auug.org.au>
On Tue, 24 Nov 2009, Stephen Rothwell wrote:
> 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 {
Maybe the best resolution would be for Davem to merge the respective hunk
through his tree, so that I can drop it on my side. Please let me know
if/when this, I will drop the hunk then.
From: André Goddard Rosa <andre.goddard@gmail•com>
Subject: e1000e: fix assorted typos
Signed-off-by: André Goddard Rosa <andre.goddard@gmail•com>
Signed-off-by: Jiri Kosina <jkosina@suse•cz>
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -282,7 +282,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
/*
* Ensure that the inter-port SWSM.SMBI lock bit is clear before
- * first NVM or PHY acess. This should be done for single-port
+ * first NVM or PHY access. This should be done for single-port
* devices, and for one port only on dual-port devices so that
* for those devices we can still use the SMBI lock to synchronize
* inter-port accesses to the PHY & NVM.
@@ -1412,7 +1412,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
case e1000_serdes_link_autoneg_progress:
/*
* If the LU bit is set in the STATUS register,
- * autoneg has completed sucessfully. If not,
+ * autoneg has completed successfully. If not,
* try foring the link because the far end may be
* available but not capable of autonegotiation.
*/
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 99ba2b8..b065ba4 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -571,7 +571,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
if (!(rxcw & E1000_RXCW_IV)) {
mac->serdes_has_link = true;
hw_dbg(hw, "SERDES: Link up - autoneg "
- "completed sucessfully.\n");
+ "completed successfully.\n");
} else {
mac->serdes_has_link = false;
hw_dbg(hw, "SERDES: Link down - invalid"
next prev parent reply other threads:[~2009-11-24 9:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 6:14 linux-next: manual merge of the trivial tree with the net tree Stephen Rothwell
2009-11-24 9:13 ` Jiri Kosina [this message]
2009-11-30 1:13 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
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=alpine.LSU.2.00.0911241011520.6953@wotan.suse.de \
--to=jkosina@suse$(echo .)cz \
--cc=andre.goddard@gmail$(echo .)com \
--cc=bruce.w.allan@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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