From: David S. Miller Date: Thu, 31 Jul 2014 01:47:51 +0000 (-0700) Subject: Merge branch 'amd-xgbe-next' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6b1bed793d69ca162eac7a2a2f4f629fc4d0d325;p=linux-beck.git Merge branch 'amd-xgbe-next' Tom Lendacky says: ==================== amd-xgbe: AMD XGBE driver update 2014-07-25 This patch series is dependent on the following patch that was applied to the net tree and needs to be applied to the net-next tree: 332cfc823d18 - amd-xgbe: Fix error return code in xgbe_probe() The following series of patches includes fixes and new support in the driver. - Device bindings documentation update - Hardware timestamp support - 2.5GbE support changes - Fifo sizes based on active queues/rings - Phylib driver updates for: - Rate change completion check - KR training initiation - Auto-negotiation results - Traffic class support, including DCB support This patch series is based on net-next. Changes in V2: - Remove DBGPR(...., __func__) calls ==================== Signed-off-by: David S. Miller --- 6b1bed793d69ca162eac7a2a2f4f629fc4d0d325