OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bd6cd4e) | patch
i40e: fix merge error
authorAlice Michael <alice.michael@intel.com>
Tue, 29 Aug 2017 09:32:36 +0000 (05:32 -0400)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 6 Oct 2017 15:11:31 +0000 (08:11 -0700)
commit7f6618226360b4aa0230a49525c81bf47d1d53c8
treecd6adb7d6bf830ec203bbf06b5ed696c86431d6atree | snapshot
parentbd6cd4e6dd38a35215d3f28f12db51213c9aead6commit | diff
i40e: fix merge error

This patch removes some code that was accidentally added to
the wrong function with a merge error.  Fixes: c53934c6d1b1
("i40e: fix: do not sleep in netdev_ops")

Signed-off-by: Alice Michael <alice.michael@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c diff | blob | history
This is a test repository.
About OSDN
Find Software
Develop Software
Help