From: David S. Miller Date: Wed, 18 Jul 2012 16:20:03 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: v3.6-rc1~125^2~118 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3fe065cea56f1fcd4f8e4ae1fb15fa785d2bb79;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next Jerr Kirsher says: ==================== This series contains updates to ixgbe & ixgbevf. ... Alexander Duyck (6): ixgbe: Ping the VFs on link status change to trigger link change ixgbe: Handle failures in the ixgbe_setup_rx/tx_resources calls ixgbe: Move configuration of set_real_num_rx/tx_queues into open ixgbe: Update the logic for ixgbe_cache_ring_dcb and DCB RSS configuration ixgbe: Cleanup logic for MRQC and MTQC configuration ixgbevf: Update descriptor macros to accept pointers and drop _ADV suffix ==================== Signed-off-by: David S. Miller --- c3fe065cea56f1fcd4f8e4ae1fb15fa785d2bb79