On Wed Jul 23, 2025 at 2:19 PM CEST, Mark Brown wrote: > On Wed, Jul 23, 2025 at 01:09:35PM +0200, Luca Weiss wrote: >> On Wed Jul 23, 2025 at 12:57 PM CEST, Mark Brown wrote: > >> > As previously discussed they won't apply until after the merge window. > >> Sorry about that, I thought the conflict was for the 6.16 merge window, >> not 6.17? > > There is a conflict. You could check this yourself...
I see now where the conflict is, due to an updated previous patch. I will send a v3 shortly with that resolved. Then it applies on your for-next branch cleanly. Regards Luca

