From: David S. Miller Date: Mon, 4 Nov 2013 21:20:33 +0000 (-0500) Subject: Merge branch 'mlx4' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5a6e55c461db3364aa5be919101db972bc859133;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'mlx4' Or Gerlitz says: ==================== Mellanox driver updates This patch set from Jack Morgenstein does the following: 1. Fix MAC/VLAN SRIOV implementation, and add wrapper functions for VLAN allocation and de-allocation (patches 1-6). 2. Implements resource quotas when running under SRIOV (patches 7-10). Patch 7 is a small bug fix, and patches 8-10 implement the quotas. Quotas are implemented per resource type for VFs and the PF, to prevent any entity from simply grabbing all the resources for itself and leaving the other entities unable to obtain such resources. The series is against net-next commit ba48650 "ipv6: remove the unnecessary statement in find_match()" changes from V0: - dropped the 1st patch which needs to go to -stable and hence through net, not net-next ==================== Signed-off-by: David S. Miller --- 5a6e55c461db3364aa5be919101db972bc859133