On Fri, Sep 22, 2023 at 01:45:58PM +0200, Thorsten Leemhuis wrote:
> On 21.09.23 22:19, Bjorn Helgaas wrote:
> > On Mon, Sep 18, 2023 at 08:30:41AM +0300, Mika Westerberg wrote:
> >> Mark Blakeney reported that when suspending system with a Thunderbolt
> >> dock connected and then unplugging the dock before resume (which is
> >> pretty normal flow with laptops), resuming takes long time.
> >>
> >> What happens is that the PCIe link from the root port to the PCIe switch
> >> inside the Thunderbolt device does not train (as expected, the link is
> >> upplugged):
> > [...]
> >> Fixes: e8b908146d44 ("PCI/PM: Increase wait time after resume")
> >> Reported-by: Mark Blakeney <mark.blakeney@xxxxxxxxxxxxxxxxxx>
> >> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217915
> >> Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> >
> > Applied with Lukas' Reviewed-by to pm for v6.7.
> >
> > e8b908146d44 appeared in v6.4.
>
> Then why did you apply this for 6.7 and not to a branch targeting the
> current cycle? Linus wants regression introduced during round about the
> last 12 months to be handled liked regressions from the current cycle,
I was not aware of the last 12 months rule. Happy to change if that's
the guideline. My previous rule of thumb was: fixes for regressions
in the most recent merge window always go to current cycle, fixes for
older regressions case-by-case.
Bjorn
