linux-kernel - linux-next: manual merge of the trivial tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 5 Feb 2010 13:37:47 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Adam Buchbinder <adam.buchbinder@...il.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Ben Hutchings <bhutchings@...arflare.com>
Subject: linux-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/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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/