Re: hibernation reverts in 4.19.134: better alternative?

From: Eugeniu Rosca
Date: Tue Jul 21 2020 - 02:51:09 EST


Hi Pavel,

On Mon, Jul 20, 2020 at 12:15:22PM +0200, Pavel Machek wrote:
> This is queued for 4.19.134-stable, reverting 3 patches. But it seems
> better alternative is available...
>
> commit f3e697b7b6f5e2c570226f8f8692fb7db57215ec
> Author: Sasha Levin <sashal@xxxxxxxxxx>
> Date: Fri Jul 17 12:58:32 2020 -0400
>
> Revert "usb/ohci-platform: Fix a warning when hibernating"
>
> This reverts commit c83258a757687ffccce37ed73dba56cc6d4b8a1b.
>
> Eugeniu Rosca writes:
>
> ...
>
> > - Backporting 987351e1ea7772 ("phy: core: Add consumer device
> > link support") to v4.14.187 looks challenging enough, so probably not
> > worth it. Anybody to contradict this?
>
> Backporting 987351e1ea7772 to 4.4 may be "interesting", but backport

Typo? 4.14 meant?

> to 4.19 seems trivial, here, and it seems to work ok according to CIP
> test suites:
>
> https://gitlab.com/cip-project/cip-kernel/linux-cip/-/pipelines/168487477
>
> (You can simply apply 987351e1ea7772 ignoring one file that is not yet
> present in 4.19.)

Technically yes. Backporting 987351e1ea7772 to v4.19.x avoids the panic.
But it means integrating a v5.6 feature (isn't 987351e1ea7772 one?) into
the v4.19.x stable tree. Isn't v4.19.x (just like any other stable
branch) supposed to contain just fixes?

Should then any missing prerequisite features be pumped in into the
stable tree, whenever backporting a bugfix produces unexpected results?

FWIW I confirm that:
* setup [A] leads to the issue reported in [C]
* setup [B] resolves the issue reported in [C]

[A] v4.19 + 16bdc04cc98 + 1cb3b0095c3 + 79112cc3c29f
[B] v4.19 + 16bdc04cc98 + 1cb3b0095c3 + 79112cc3c29f + 987351e1ea7
[C] https://lore.kernel.org/linux-usb/20200709070023.GA18414@xxxxxxxxxxxxxxxxxxxx/

--
Best regards,
Eugeniu Rosca