Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210411102344.2834328-1-martin.blumenstingl@googlemail.com> <YHMoRAAVSKvfF6b9@sashalap>
In-Reply-To: <YHMoRAAVSKvfF6b9@sashalap>
From:   Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date:   Sun, 11 Apr 2021 19:17:46 +0200
Message-ID: <CAFBinCDmkJinzxG0XVoLvCnA+a4wDDfKyg-5GiHs0abAMsi1Cg@mail.gmail.com>
Subject: Re: [PATCH stable-5.4 0/2] net: dsa: lantiq_gswip: backports for
 Linux 5.4
To:     Sasha Levin <sashal@kernel.org>
Cc:     stable@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, Hauke Mehrtens <hauke@hauke-m.de>,
        f.fainelli@gmail.com, davem@davemloft.net
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi Sasha,

On Sun, Apr 11, 2021 at 6:48 PM Sasha Levin <sashal@kernel.org> 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


Best regards,
Martin