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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250902121015.GI13448@pendragon.ideasonboard.com>
Date: Tue, 2 Sep 2025 14:10:15 +0200
From: Laurent Pinchart <laurent.pinchart@...asonboard.com>
To: Mark Brown <broonie@...nel.org>
Cc: Lee Jones <lee@...nel.org>, linux@...blig.org, arnd@...db.de,
	mchehab@...nel.org, lgirdwood@...il.com, perex@...ex.cz,
	tiwai@...e.com, linux-media@...r.kernel.org,
	linux-sound@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 0/4] Remove the wl1273 FM Radio

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