From: David S. Miller Date: Thu, 14 Aug 2014 03:08:55 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9789^2~14 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=db8d457acccdb605b82ae22e48d28a47861b0c86;p=mirror_ubuntu-artful-kernel.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2014-08-12 This series contains updates to i40e and e1000e. Lucas provides a fix for i40e to resolve a compile issue where a header was missing in the #includes. Wei Yongjun provides a fix for i40e to resolve a sparse warning, where a non-static function should be static. Julia Lawall provides a fix for i40e which was found using Coccinelle, where there was a typo in the name of the type given to sizeof(). Rickard Strandqvist provides a fix for i40e to replace the use of strncpy() with strlcpy() to avoid strings that lack null termination. Jean Sacren provides two e1000e fixes, first is a comment fix and second removes an excessive space character in a debug message. ==================== Signed-off-by: David S. Miller --- db8d457acccdb605b82ae22e48d28a47861b0c86