From: David S. Miller Date: Sat, 18 Jan 2014 02:38:13 +0000 (-0800) Subject: Merge branch 'ixgbe' X-Git-Tag: v4.0~2533^2~105 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7dd40c197cea4effe7469d1eb612fabd69eef989;p=platform%2Fkernel%2Flinux-amlogic.git Merge branch 'ixgbe' Aaron Brown says: ==================== Intel Wired LAN Driver Updates This series contains updates to ixgbe Ethan Zhao. The first one replaces the magic number "63" with a macro, IXGBE_MAX_VFS_DRV_LIMIT, the second moves the call to set driver_max_VFS to before SRIOV is enabled. The code of these patches match the v3 (1/2) and v2 (2/2) versions sent to the e1000-devel and netdev mailing lists. The intermediate versions (v4, v5) are from sorting out style issues, mostly tabs to spaces and split lines probably introduced via mailer. ==================== Signed-off-by: David S. Miller --- 7dd40c197cea4effe7469d1eb612fabd69eef989