From: David S. Miller Date: Wed, 17 Feb 2016 20:23:53 +0000 (-0500) Subject: Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next... X-Git-Tag: MMI-PSA29.97-13-9~8298^2~254 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2069230401d3d56c8d1fb9f8249e1a6d2bb31b35;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch '40GbE' of git://git./linux/kernel/git/jkirsher/next-queue Jeff Kirsher says: ==================== 40GbE Intel Wired LAN Driver Updates 2016-02-17 This series contains updates to i40e/i40evf only. Jesse cleans up a duplicate declaration in probe. Then fixes a bug where the driver was using a offset based off a DMA handle while mapping and unmapping using sync_single_range_for_[cpu|device], when it should be using DMA handle (returned from alloc_coherent) and the offset of the memory to be sync'd. Fixed an issue where sync_vsi_filter() was allocating memory in a way that could sleep (GFP_KERNEL) which was causing a problem when called by the team driver under rcu_read_lock(). Shannon adds a check to ensure we do not attempt to do TSO when skb->ip_summed is not set to CHECKSUM_PARTIAL. Kiran add functions related to port mirroring features such as add/delete mirror rule. Jacob assigns the i40e_pf structure directly instead of using a large memcpy, to avoid a sparse warning and lets the compiler optimize the copy since it know the size of the structure in advance. Anjali enables GENEVE capability for XL710/X710 devices with firmware API version higher than 1.4. Added flag for automatic rule eviction feature for X722, which is disabled by default. ==================== Signed-off-by: David S. Miller --- 2069230401d3d56c8d1fb9f8249e1a6d2bb31b35