linux-kernel - Re: linux-next: build failure after merge of the pwm tree

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: <DDT5IDT0GI4H.4GBFX9U17WU3@kernel.org>
Date: Mon, 27 Oct 2025 14:49:54 +0100
From: "Danilo Krummrich" <dakr@...nel.org>
To: Uwe Kleine-König <ukleinek@...nel.org>
Cc: "Greg Kroah-Hartman" <gregkh@...uxfoundation.org>, "Michal Wilczynski"
 <m.wilczynski@...sung.com>, "Boqun Feng" <boqun.feng@...il.com>, "Daniel
 Almeida" <daniel.almeida@...labora.com>, "Peter Colberg"
 <pcolberg@...hat.com>, "Lyude Paul" <lyude@...hat.com>, "Miguel Ojeda"
 <ojeda@...nel.org>, "Linux Kernel Mailing List"
 <linux-kernel@...r.kernel.org>, "Linux Next Mailing List"
 <linux-next@...r.kernel.org>, "Alice Ryhl" <aliceryhl@...gle.com>, "Viresh
 Kumar" <viresh.kumar@...aro.org>, "Alexandre Courbot"
 <acourbot@...dia.com>, "Stephen Rothwell" <sfr@...b.auug.org.au>
Subject: Re: linux-next: build failure after merge of the pwm tree

On Mon Oct 27, 2025 at 2:40 PM CET, Uwe Kleine-König wrote:
> To make it easy for Linus to merge my pwm tree during the next merge
> window, it would be great if it could contain the conflict resolution.
> Can I assume that this commit is stable, will be part of your next MR
> and are you ok if I merge it into my tree with the fix for the conflict?

I think the conflict is trivial enough to resolve, so I don't think Linus would
mind.

Anyways, the commit is stable, so feel free to go ahead. Also note, when I send
the PR (which I will likely do) I usually send a very early PR to Linus, right
before the merge window opens.

- Danilo