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=-6.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 E61E9C43460 for ; Sun, 11 Apr 2021 18:17:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A15426108B for ; Sun, 11 Apr 2021 18:17:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236078AbhDKSRo (ORCPT ); Sun, 11 Apr 2021 14:17:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:35824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235284AbhDKSRn (ORCPT ); Sun, 11 Apr 2021 14:17:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A25A6109F; Sun, 11 Apr 2021 18:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618165046; bh=YXf8Yyuuop+Bs4/HJM1E6o7/73iH/bZFU6Te9hUNYt0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Gl4p3og+nvvhqXxjNI2Bo2nO6kZbgSRXuLqbln13LysVX4+t4Y6tx6jnyypmTD5Hn 0Gmh8/rIrDkLIPBZ900ttMM7gkqisyGrzLg8YztdyKGyCpV7yu+iGwgM3NUxNc4B9S WCJlfJHZEXzDmViVkzRR4lltsI/SiwSS2XnCKOKnbwqSeZX+2ofmqEEgroTcu40Ppv xLkIfQlW7WjOWKhL167Gt04SkDCHFzXFk5BHxckoHjvDHpyeSalFYiOkkB9D85Dvv6 KVyU9HEb5la8xh7dMDAN3oTL/7LAhvIeF/my5bL6b5egm/aVy0tJMuNXSpArovnK/M CfZN4dwbp1T/A== Date: Sun, 11 Apr 2021 14:17:25 -0400 From: Sasha Levin To: Martin Blumenstingl Cc: stable@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hauke Mehrtens , f.fainelli@gmail.com, davem@davemloft.net Subject: Re: [PATCH stable-5.4 0/2] net: dsa: lantiq_gswip: backports for Linux 5.4 Message-ID: References: <20210411102344.2834328-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Apr 11, 2021 at 07:17:46PM +0200, Martin Blumenstingl wrote: >Hi Sasha, > >On Sun, Apr 11, 2021 at 6:48 PM Sasha Levin wrote: >> >> On Sun, Apr 11, 2021 at 12:23:42PM +0200, Martin Blumenstingl wrote: >> >Hello, >> > >> >This backports two patches (which could not be backported automatically >> >because the gswip_phylink_mac_link_up function is different in Linux 5.4 >> >compared to 5.7 and newer) for the lantiq_gswip driver: >> >- commit 3e9005be87777afc902b9f5497495898202d335d upstream. >> >- commit 4b5923249b8fa427943b50b8f35265176472be38 upstream. >> > >> >This is the first time that I am doing such a backport so I am not >> >sure how to mention the required modifications. I added them at the >> >bottom of each patch with another Signed-off-by. If this is not correct >> >then please suggest how I can do it rights. >> >> Hey Martin, >> >> Your backport works, but I'd rather take 5b502a7b2992 ("net: dsa: >> propagate resolved link config via mac_link_up()") along with the >> backport instead. This means that we don't diverge from upstream too >> much and will make future backports easier. >> >> I've queued up these 3 commits to 5.4, thanks! >in general I am fine with your suggested approach. however, I think at >least one more backport is required then: >91a208f2185ad4855ff03c342d0b7e4f5fc6f5df ("net: phylink: propagate >resolved link config via mac_link_up()") >Patches should be backported in a specific order also so we don't >break git bisect: >- phylink patch >- dsa patch >- the two lantiq GSWIP patches Good point, I haven't realized there's an additional phylink patch (which on it's own requires more dependencies and follow-ups). In this case I'll just grab your backport, thanks! -- Thanks, Sasha