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

[Sasha Levin <sashal@kernel.org>]

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 ------------------
>
>From 6bf6be1127f7e6d4bf39f84d56854e944d045d74 Mon Sep 17 00:00:00 2001
>From: Chen Yu <yu.c.chen@intel.com>
>Date: Fri, 22 May 2020 01:59:00 +0800
>Subject: [PATCH] e1000e: Do not wake up the system via WOL if device wakeup is
> disabled
>
>Currently the system will be woken up via WOL(Wake On LAN) even if the
>device wakeup ability has been disabled via sysfs:
> cat /sys/devices/pci0000:00/0000:00:1f.6/power/wakeup
> disabled
>
>The system should not be woken up if the user has explicitly
>disabled the wake up ability for this device.
>
>This patch clears the WOL ability of this network device if the
>user has disabled the wake up ability in sysfs.
>
>Fixes: bc7f75fa9788 ("[E1000E]: New pci-express e1000 driver")
>Reported-by: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
>Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>Cc: <Stable@vger.kernel.org>
>Signed-off-by: Chen Yu <yu.c.chen@intel.com>
>Tested-by: Aaron Brown <aaron.f.brown@intel.com>
>Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

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,
Sasha