From: David S. Miller <davem@davemloft.net>
Date: Mon, 18 Dec 2017 18:07:50 +0000 (-0500)
Subject: Merge branch 'sfc-Medford2'
X-Git-Tag: for-linus-20180210~31^2~345
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e7655085973bd33ee47bb12de663d31c81717404;p=linux-2.6-block.git

Merge branch 'sfc-Medford2'

Edward Cree says:

====================
sfc: Initial X2000-series (Medford2) support

Basic PCI-level changes to support X2000-series NICs.
Also fix unexpected-PTP-event log messages, since the timestamp format has
 been changed in these NICs and that causes us to fail to probe PTP (but we
 still get the PPS events).
====================

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

e7655085973bd33ee47bb12de663d31c81717404