On Tue, Jun 23, 2020 at 09:53:42AM -0400, Sasha Levin wrote:
> On Tue, Jun 23, 2020 at 01:58:29PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>.
> >
> > 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
