From: David S. Miller Date: Sun, 28 Jul 2013 20:18:49 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: next-20130731~64^2~23 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=34d073fcd3dd79207e65e87fd2e5ffdd9cd1b957 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== This series contains updates to e100 and e1000e. The e100 patch from Andy simply updates the netif_printk() to use %*ph to dump small buffers. The changes to e1000e include a fix from Dean Nelson to resolve a issue where a pci_clear_master() was accidentally dropped during a conflict resolution. Wei Young provides 2 patches, one removes an assignment of the default ring size because it was a duplicate. The second changes the packet split receive structure to use PS_PAGE_BUFFERS macro for the length so that problems won't occur when the length is changed. The remaining patches for e1000e are from Bruce Allan, where he provides a number of fixes and updates for I218. In addition, a fix for 82583 which can disappear off the PCIe bus, to resolve this, disable ASPM L1. Bruce also provides a fix to a previous commit (commit e60b22c5b7 e1000e: fix accessing to suspended device) so that devices are only taken out of runtime power management for those ethtool operations that must access device registers. ==================== Signed-off-by: David S. Miller --- 34d073fcd3dd79207e65e87fd2e5ffdd9cd1b957