From: David S. Miller <davem@davemloft.net>
Date: Wed, 13 May 2015 19:11:52 +0000 (-0400)
Subject: Merge branch 'sfc-next'
X-Git-Tag: v4.2-rc1~130^2~305
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=212da1fa60a822f5a7f20d52d11524dadd192a91;p=karo-tx-linux.git

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>
---

212da1fa60a822f5a7f20d52d11524dadd192a91