From: David S. Miller Date: Wed, 8 Apr 2015 16:21:36 +0000 (-0400) Subject: Merge branch 'sfc-next' X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~51 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ae178fb1ce0428d1a22c36c8493bda4807ad3b8;p=pandora-kernel.git Merge branch 'sfc-next' Shradha Shah says: ==================== sfc: Nic specific sriov functions, netdev_ops and sriov_configure First two patches among the series of patches to support SRIOV on EF10. First patch declares nic specific sriov functions in nic specific headers, creates only one instance of the netdev_ops, removes sriov functionality from Falcon code. Second patch adds support for sriov_configure. The Virtual Functions can be enabled but they do not bind to the SFC driver just yet. ==================== Signed-off-by: David S. Miller --- 8ae178fb1ce0428d1a22c36c8493bda4807ad3b8 Reading git-diff-tree failed