On Tue, May 14, 2024 at 02:26:02PM +0200, Jerome Brunet wrote:
On Tue 14 May 2024 at 12:19, Greg Kroah-Hartman gregkh@linuxfoundation.org wrote:
5.15-stable review patch. If anyone has any objections, please let me know.
Patch #100 and #101 should not be applied on v5.15.
A bit of history:
- 3y ago patches #44 and #45 have been applied to fix a problem in AML audio, but it caused a regression.
- No solution was found at the time, so the patches were reverted by change #100 and #101
- Recently I came up with change #43 which fixes the regression from 3y ago, so the fixes for original problem could be applied again (with a different sha1 of course)
The situation was detailed in the cover letter of the related series: https://lore.kernel.org/linux-amlogic/20240426152946.3078805-1-jbrunet@bayli...
From what I can see the backport is fine on 6.8, 6.6 and 6.1.
Things starts to be problematic on 5.15.
In general, if upstream commit b11d26660dff is backported, it is fine to apply upstream commits:
- dcba52ace7d4 ("ASoC: meson: axg-card: make links nonatomic")
- f949ed458ad1 ("ASoC: meson: axg-tdm-interface: manage formatters in trigger")
And the following commits (which are reverts for the 2 above) should not be applied:
- 0c9b152c72e5 ("ASoC: meson: axg-card: Fix nonatomic links")
- c26830b6c5c5 ("ASoC: meson: axg-tdm-interface: Fix formatters in trigger"")
If b11d26660dff is not backported, the 2 first change should be backported, or reverted if they have already been.
- v5.15: just dropping change #100 and #101 should be fine
I have now dropped these.
- v5.10: I suppose this is where the backport starts to be problematic Best would be to drop #31, #32, #73 and #74 for now
All now dropped.
- v5.4: Same drop #26, #27, #60 and #61
All now dropped.
- v4.19: drop #17 and #44
Dropped!
thanks for letting me know.
greg k-h