On 24.07.2023 19:32, Greg KH wrote:
> On Mon, Jul 24, 2023 at 05:59:07PM +0200, Heiner Kallweit wrote:
>> There have been reports that on a number of systems this change breaks
>> network connectivity. Therefore effectively revert it. Mainly affected
>> seem to be systems where BIOS denies ASPM access to OS.
>> Due to later changes we can't do a direct revert.
>>
>> Fixes: 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")
>> Cc: stable@xxxxxxxxxxxxxxx # v6.4.y
>> Link: https://lore.kernel.org/netdev/e47bac0d-e802-65e1-b311-6acb26d5cf10@xxxxxxxxxx/T/
>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217596
>> Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
>> Link: https://lore.kernel.org/r/57f13ec0-b216-d5d8-363d-5b05528ec5fb@xxxxxxxxx
>> Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
>> ---
>> drivers/net/ethernet/realtek/r8169_main.c | 27 ++++++++++++++++++++++-
>> 1 file changed, 26 insertions(+), 1 deletion(-)
>>
>
> <formletter>
>
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree. Please read:
> https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> for how to do this properly.
>
> </formletter>
The conflict notification email mentioned the following, therefore I replied
with the backported patch. Which part is wrong or what is missing?
The patch below does not apply to the 6.4-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>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y
git checkout FETCH_HEAD
git cherry-pick -x cf2ffdea0839398cb0551762af7f5efb0a6e0fea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023072337-dreamlike-rewrite-a12e@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..
