From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3D58C433E3 for ; Tue, 23 Jun 2020 13:54:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1FB320768 for ; Tue, 23 Jun 2020 13:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592920457; bh=bUclb6Oe7snTcTLzYvMMxs78tXwbtfS+deEJB66mUt4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=k2milcSf3pwfDxUtHwIqto2MjqxsQ7jWD3rdg+fvEbyJrHJzIpVs5EaTGPoneDJkJ 2PjJieXRz2uVfcanIhttBJ4go20mv89GdoUkRK40MfMgpyZcRVRDZ1ep35qP5weumj E/ZKT7S2qqiiaPBJDktQnKgZ7TGrwLipgG4mpQbU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732821AbgFWNyQ (ORCPT ); Tue, 23 Jun 2020 09:54:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:35464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732833AbgFWNxo (ORCPT ); Tue, 23 Jun 2020 09:53:44 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D564020724; Tue, 23 Jun 2020 13:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592920424; bh=bUclb6Oe7snTcTLzYvMMxs78tXwbtfS+deEJB66mUt4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IEoAh811/sIj9QRJqkEm5/75G1qgGxF9diMuHZqKtqMEIR2yKwfLmTd+STYvxh5CW WpxXjeLKSSk/FgQulc8EvPB4uE69nCXDERpJasMkmBCI0WFo73MWZjzNfdf/7Z/1pf 42gSTaGoGG+IPWYRrCpN8lYn0HlEUdodQ9EO1wVM= Date: Tue, 23 Jun 2020 09:53:42 -0400 From: Sasha Levin To: gregkh@linuxfoundation.org Cc: yu.c.chen@intel.com, 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 Message-ID: <20200623135342.GZ1931@sasha-vm> References: <15929135091516@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <15929135091516@kroah.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.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 . > >thanks, > >greg k-h > >------------------ original commit in Linus's tree ------------------ > >>From 6bf6be1127f7e6d4bf39f84d56854e944d045d74 Mon Sep 17 00:00:00 2001 >From: Chen Yu >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" >Reviewed-by: Andy Shevchenko >Cc: >Signed-off-by: Chen Yu >Tested-by: Aaron Brown >Signed-off-by: Jeff Kirsher 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