Re: [PATCH 0/4] Remove the wl1273 FM Radio

Laurent Pinchart
2025-09-02T12:10:38Z

On Tue, Sep 02, 2025 at 12:47:39PM +0100, Mark Brown wrote:
> On Tue, Sep 02, 2025 at 01:35:27PM +0200, Laurent Pinchart wrote:
>
> > Patch 1/4 has been queued in the media tree and should be in linux-next
> > as commit 103b0cfc9ab6. It is based straight on v6.17-rc1. Patch 2/4 is
> > also in linux-next, but is based on other ALSA patches. The simplest
> > course of action would be for you to merge 3/4 for v6.18, and 4/4 for
> > v6.19.
>
> Or given that it's a driver removal we could just get a rebase of the
> series against the meda tree applied? The conflicts with ASoC should be
> trivial to resolve.

I don't mind either way. I know Linus doesn't like having the same patch
merged with different commit IDs, but I don't know how strict the rule
is, especially when git should be able to resolve the conflict
transparently.

--
Regards,

Laurent Pinchart