From: David S. Miller Date: Mon, 3 Nov 2014 17:28:21 +0000 (-0500) Subject: Merge branch 'mlx4-next' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=547f2735c20023d7b50a791b1b17cacb652e9237;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'mlx4-next' Or Gerlitz says: ==================== Mellanox ethernet driver update Oct-30-2014 The 1st patch from Saeed fixes a bug in the last net-next batch where a VF could get access to set port configuration, the next patch from Amir fixes a race in the port VPI logic. Next are two performance patches from Ido. The patch to add checksum complete status on GRE and such packets was preceded with a patch that converted the driver to only use napi_gro_receive vs. the current code which goes through napi_gro_frags on it's usual track. Eric D. has some thoughts and suggestions on that change for which we want to take the time and consider, so for the time being dropped that patch and the ones that depend on it. Changes from V0: - have the caller to provide the __GFP_COLD hint to the service function - dropped the patch that changes the GRO logic and the subsequent dependent patches. ==================== Signed-off-by: David S. Miller --- 547f2735c20023d7b50a791b1b17cacb652e9237