From: David S. Miller Date: Fri, 8 Mar 2013 17:25:03 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: Ubuntu-5.2.0-15.16~15790^2~542 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0bcf6aa72b986f9e74d5e6bd717dbf8aef3ea533;p=mirror_ubuntu-eoan-kernel.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== This series contains updates to ixgbevf and e1000e. Alex's ixgbevf patch is meant to address several race issues that become possible because next_to_watch could possibly be set to a value that shows that the descriptor is done when it is not. In order to correct that we instead make next_to_watch a pointer that is set to NULL during cleanup, and set to the eop_desc after the descriptor rings have been written. Stephen's ixgbevf patch makes the PCI id table a const and reformats the table to match what the ixgbe driver does. The remaining 13 patches from Bruce are cleanup patches for e1000e to resolve checkpatch.pl warnings/errors, removing blank lines where necessary and fix code formatting. ==================== Signed-off-by: David S. Miller --- 0bcf6aa72b986f9e74d5e6bd717dbf8aef3ea533