From: Jesse Brandeburg <jesse.brandeburg@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH] i40e: fix merge bug
Date: Wed, 6 Jan 2016 17:15:35 -0800 [thread overview]
Message-ID: <20160106171535.00006b3e@unknown> (raw)
In-Reply-To: <1452128791-17584-1-git-send-email-jesse.brandeburg@intel.com>
On Wed, 6 Jan 2016 17:06:31 -0800
Jesse Brandeburg <jesse.brandeburg@intel.com> wrote:
> There was a bug (re-)introduced by a merge error when applying patches.
> This fixes the issue by making the code schedule the work item as
> originally intended for the fix included in commit 0e4425ed641f ("i40e:
> fix: do not sleep in netdev_ops") and broken in commit ea02e90b4b49
> ("i40e: propagate properly").
>
> Fixes: ea02e90b4b49 ("i40e: propagate properly")
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
targeted at net-next, tested on next-queue/dev-queue, please send ASAP
as this standalone patch applied cleanly to davem's net-next/master
when tested just now.
next prev parent reply other threads:[~2016-01-07 1:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 1:06 [Intel-wired-lan] [PATCH] i40e: fix merge bug Jesse Brandeburg
2016-01-07 1:15 ` Jesse Brandeburg [this message]
2016-01-08 6:54 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160106171535.00006b3e@unknown \
--to=jesse.brandeburg@intel.com \
--cc=intel-wired-lan@osuosl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.