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,
Adam Buchbinder <adam.buchbinder@gmail•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Ben Hutchings <bhutchings@solarflare•com>
Subject: linux-next: manual merge of the trivial tree with the net tree
Date: Fri, 5 Feb 2010 13:37:47 +1100 [thread overview]
Message-ID: <20100205133747.14ca83f2.sfr@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/sfc/mcdi_pcol.h between commit
5297a98d5dd6de86fe1e2ffc9ea60cdf59b71443 ("sfc: Update MCDI protocol
definitions") from the net tree and commit
4887b438e6880c73c4b44d868211e70c1f3deaec ("Fix misspelling of
"successful" and variants in comments") 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/sfc/mcdi_pcol.h
index bd59302,f61e1de..0000000
--- a/drivers/net/sfc/mcdi_pcol.h
+++ b/drivers/net/sfc/mcdi_pcol.h
@@@ -859,14 -852,11 +859,14 @@@
/* MC_CMD_POLL_PHY_BIST: (variadic output)
* Poll for BIST completion
*
- * Returns a single status code, and a binary blob of phy-specific
- * bist output. If the driver can't successfully parse the BIST output,
- * it should still respect the Pass/Fail in OUT.RESULT.
+ * Returns a single status code, and optionally some PHY specific
+ * bist output. The driver should only consume the BIST output
+ * after validating OUTLEN and PHY_CFG.PHY_TYPE.
*
- * If a driver can't succesfully parse the BIST output, it should
- * Locks required: PHY_LOCK if doing a PHY BIST
++ * If a driver can't successfully parse the BIST output, it should
+ * still respect the pass/Fail in OUT.RESULT
+ *
+ * Locks required: PHY_LOCK if doing a PHY BIST
* Return code: 0, EACCES (if PHY_LOCK is not held)
*/
#define MC_CMD_POLL_BIST 0x26
next reply other threads:[~2010-02-05 2:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-05 2:37 Stephen Rothwell [this message]
2010-02-05 4:26 ` linux-next: manual merge of the trivial tree with the net tree David Miller
2010-02-05 8:39 ` Jiri Kosina
2010-02-05 11:23 ` Jiri Kosina
2010-02-05 16:55 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-07-22 4:18 Stephen Rothwell
2011-07-22 6:42 ` Francois Romieu
2011-01-04 3:22 Stephen Rothwell
2011-01-05 14:51 ` Jiri Kosina
2011-01-05 15:22 ` Justin P. Mattock
2010-10-12 0:53 Stephen Rothwell
2010-09-24 2:19 Stephen Rothwell
2010-09-24 12:09 ` Jiri Kosina
2010-02-24 5:21 Stephen Rothwell
2010-02-16 3:50 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
2009-11-30 2:53 Stephen Rothwell
2009-11-30 12:36 ` Jiri Kosina
2009-11-30 19:55 ` Stephen Rothwell
2009-11-24 6:14 Stephen Rothwell
2009-11-24 9:13 ` Jiri Kosina
2009-11-30 1:13 ` David Miller
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=20100205133747.14ca83f2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=adam.buchbinder@gmail$(echo .)com \
--cc=bhutchings@solarflare$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/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