diff options
author | Luis R. Rodriguez <mcgrof@suse.com> | 2014-11-20 13:05:21 -0800 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-11-20 13:39:40 -0800 |
commit | f1309fb8c18f8471415b4b2defbd72ff5fb5a859 (patch) | |
tree | 73ec04b93a550ff61d73f764343c69243ef1cbcd /patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch | |
parent | 3f817a16f30e1633d44aae9f24d18549c8b09d11 (diff) |
backports: refresh patches for next-20141117backports-20141117
This required no manual changes.
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py \
/home/mcgrof/linux-next /home/mcgrof/build/backports-20141117
Copy original source files ...
Applying patches from patches to /home/mcgrof/build/backports-20141117
...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!
real 1m28.499s
user 13m25.112s
sys 0m47.804s
mcgrof@drvbp1 ~/build/backports-20141117 $ time \
/home/mcgrof/backports/devel/ckmake --allyesconfig
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.104 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.58 [ OK ]
12 3.11.10 [ OK ]
13 3.12.31 [ OK ]
14 3.13.11 [ OK ]
15 3.14.22 [ OK ]
16 3.15.10 [ OK ]
17 3.16.6 [ OK ]
18 3.17.1 [ OK ]
19 3.18-rc1 [ OK ]
real 42m18.874s
user 1179m40.500s
sys 138m54.452s
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Diffstat (limited to 'patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch')
-rw-r--r-- | patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch index cad85cf6..6ece3a26 100644 --- a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch +++ b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch @@ -20,7 +20,7 @@ .err_handler = &igb_err_handler }; -@@ -7524,6 +7528,7 @@ static int igb_sriov_reinit(struct pci_d +@@ -7521,6 +7525,7 @@ static int igb_sriov_reinit(struct pci_d return 0; } @@ -28,7 +28,7 @@ static int igb_pci_disable_sriov(struct pci_dev *dev) { int err = igb_disable_sriov(dev); -@@ -7533,6 +7538,7 @@ static int igb_pci_disable_sriov(struct +@@ -7530,6 +7535,7 @@ static int igb_pci_disable_sriov(struct return err; } @@ -36,7 +36,7 @@ static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs) { -@@ -7550,6 +7556,7 @@ out: +@@ -7547,6 +7553,7 @@ out: } #endif @@ -44,7 +44,7 @@ static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs) { #ifdef CONFIG_PCI_IOV -@@ -7560,6 +7567,7 @@ static int igb_pci_sriov_configure(struc +@@ -7557,6 +7564,7 @@ static int igb_pci_sriov_configure(struc #endif return 0; } |