[Intel-wired-lan] [next PATCH S26 06/12] i40e: fix: do not sleep in netdev_ops

[Brandeburg, Jesse]

> There was another commit on 3-Dec that reverted/modified the i40e_set_mac(). 
> 3-Dec: https://git.kernel.org/cgit/linux/kernel/git/jkirsher/next-queue.git/commit/?h=dev-queue&id=ea02e90b4b49782462d06a425e05c776909fbae4

That patch you reference is introducing a (likely) merge resolution error, and re-introducing the bug that the original patch fixed, this is just an artifact of the order of things applied to the kernel, that we need to fix with the right code upstream.