From: David S. Miller Date: Tue, 4 Oct 2016 03:28:50 +0000 (-0400) Subject: Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next... X-Git-Tag: Ubuntu-4.10.0-19.21~2496^2~6 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0438e3c88c54b11ab6168d55eb7c696aeaa32b14;p=mirror_ubuntu-artful-kernel.git Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue Jeff Kirsher says: ==================== 100GbE Intel Wired LAN Driver Updates 2016-10-02 This series contains updates to fm10k only. Jake fixes an issue where PTP applications requesting software timestamps may complain that the requested mode is not supported, so add a generic callback for those drivers that have software transmit timestamp support enabled. Then provides a trivial cleanup where a code was not wrapped properly. Got make sure that code looks good in a 80 character limit. ==================== Signed-off-by: David S. Miller --- 0438e3c88c54b11ab6168d55eb7c696aeaa32b14