From: Chen Yu <yu.c.chen@intel.com>
To: Sasha Levin <sashal@kernel.org>
Cc: gregkh@linuxfoundation.org, Stable@vger.kernel.org,
aaron.f.brown@intel.com, andriy.shevchenko@linux.intel.com,
jeffrey.t.kirsher@intel.com, rafael.j.wysocki@intel.com
Subject: Re: FAILED: patch "[PATCH] e1000e: Do not wake up the system via WOL if device wakeup is" failed to apply to 4.9-stable tree
Date: Wed, 24 Jun 2020 21:22:12 +0800 [thread overview]
Message-ID: <20200624132212.GA18576@chenyu-office.sh.intel.com> (raw)
In-Reply-To: <20200623135342.GZ1931@sasha-vm>
On Tue, Jun 23, 2020 at 09:53:42AM -0400, Sasha Levin wrote:
> On Tue, Jun 23, 2020 at 01:58:29PM +0200, gregkh@linuxfoundation.org wrote:
> >
> > The patch below does not apply to the 4.9-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> >
> > thanks,
> >
> > greg k-h
> >
> > ------------------ original commit in Linus's tree ------------------
> >
>
> Conflict was because we don't have c8744f44aeae ("e1000e: Add Support
> for CannonLake") on 4.9 and 4.4. I've worked around that and queued this
> patch for both of those branches.
>
Thanks for pointing this out, Sasha.
Best,
Chenyu
> --
> Thanks,
> Sasha
prev parent reply other threads:[~2020-06-24 13:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 11:58 FAILED: patch "[PATCH] e1000e: Do not wake up the system via WOL if device wakeup is" failed to apply to 4.9-stable tree gregkh
2020-06-23 13:53 ` Sasha Levin
2020-06-24 13:22 ` Chen Yu [this message]
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=20200624132212.GA18576@chenyu-office.sh.intel.com \
--to=yu.c.chen@intel.com \
--cc=Stable@vger.kernel.org \
--cc=aaron.f.brown@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sashal@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox