From: David S. Miller Date: Thu, 16 Jan 2014 23:35:08 +0000 (-0800) Subject: Merge branch 'ixgbe-next' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7cbdb7d7b4dc85dc96edf3a81e3b58151a72825;p=linux-beck.git Merge branch 'ixgbe-next' Aaron Brown says: ==================== Intel Wired LAN Driver Updates This series contains updates to ixgbe and ixgbevf. John adds rtnl lock / unlock semantics for ixgbe_reinit_locked() which was being called without the rtnl lock being held. Jacob corrects an issue where ixgbevf_qv_disable function does not set the disabled bit correctly. From the community, Wei uses a type of struct for pci driver-specific data in ixgbevf_suspend() Don changes the way we store ring arrays in a manner that allows support of multiple queues on multiple nodes and creates new ring initialization functions for work previously done across multiple functions - making the code closer to ixgbe and hopefully more readable. He also fixes incorrect fiber eeprom write logic. ==================== Signed-off-by: David S. Miller --- f7cbdb7d7b4dc85dc96edf3a81e3b58151a72825