]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c1f3007) | 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)
commit3f21b504aabcb8aad3e20dbe10d9ed0652b935a6
treecd6adb7d6bf830ec203bbf06b5ed696c86431d6atree | snapshot
parentc1f30073da8305efe815ada7d47940a53b127331commit | diff
i40e: fix merge error

This patch removes some code that was accidentally added to
the wrong function with a merge error.  Fixes: f4ea7d5e2f47
("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
Linux Kernel Source Tree.