Merge branch 'sfc-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 May 2015 19:11:52 +0000 (15:11 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 May 2015 19:11:52 +0000 (15:11 -0400)
commit212da1fa60a822f5a7f20d52d11524dadd192a91
treed2342809909e6e12b228fcd804d089265e8263c0
parente578d9c02587d57bfa7b560767c698a668a468c6
parent3de1b5137cbe84688c9503b67d874854e44b6622
Merge branch 'sfc-next'

Edward Cree says:

====================
sfc: Bowdlerise PTP MCDI errors

When the NIC doesn't support PTP, probe-time MCDI commands fail in
predictable ways.  Instead of logging cryptic MCDI errors, just log that
PTP isn't supported.

v2: Hopefully stop Thunderbird mangling the patches.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>