From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DE412D8773; Mon, 27 Oct 2025 13:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761572999; cv=none; b=irn3YOgjmInZcWRa3vfeAQYKctlNxl81QTPUaqjEhk25LXys1DJKPvjDt/qsA96wHnE3X9b3D2byow0ZdEC/t+HRiXg5ybE2WtNivhsl5lyS+pjRop0oCa4YprWRv15/FCIwFDmrVeE2SjQ/GUv1TZL4Q6rz6zbFonQF1bh09jI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761572999; c=relaxed/simple; bh=4CEtMduq3jdDdtBZbu4z30jJnelSXvuUtTmmAVK0YKY=; h=Mime-Version:Content-Type:Date:Message-Id:Subject:Cc:To:From: References:In-Reply-To; b=Vqulzise/aap8gPk1/nu1TEN0Tf+f0r/rJX29FNXuGR3mI1iuGp9znYqS9COcv53qv46h7bnwRK1MeZZDw8RGaV26gP+N+ku3la5IlLbo8B6tQNGeMkt/CpB7hghEFcM/eJmFv7PIGVp8AtoOABsbiioVWfH+dyoKxoCGTMkjFk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X0RNgoZW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="X0RNgoZW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 692FEC113D0; Mon, 27 Oct 2025 13:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761572999; bh=4CEtMduq3jdDdtBZbu4z30jJnelSXvuUtTmmAVK0YKY=; h=Date:Subject:Cc:To:From:References:In-Reply-To:From; b=X0RNgoZWFysNfSmQfpTmgO9QI2k2LNJw3ht+7e0vbiodZxe5iVJlyXsJI4ZGjF84Q inbY8TYNHy/20dnnbAwhZ08ahadPZw/5t61WJ6aep5UEK022ymxrvWI+bYWq1g2dHG SuOXuEO6kmdiUHXClXbiCl4ARyOxrBTp3zjWy51EdSuugJ/ZoRjQ1kf2aXSr4DrJwI lNX152+SzEry7yvXLzUrh1wbuw0JDe4T2CCI2FCA3uz/JgH7wDwlN6fbs5hPsQq/V6 JsWdp05ZNZQqG5aMH6Zh8zkolUezTSrkkj3CADi5w65LVc8RnF1FPOOJxYzyHTRoCR 5SwY1ZKavbe1g== Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 27 Oct 2025 14:49:54 +0100 Message-Id: Subject: Re: linux-next: build failure after merge of the pwm tree Cc: "Greg Kroah-Hartman" , "Michal Wilczynski" , "Boqun Feng" , "Daniel Almeida" , "Peter Colberg" , "Lyude Paul" , "Miguel Ojeda" , "Linux Kernel Mailing List" , "Linux Next Mailing List" , "Alice Ryhl" , "Viresh Kumar" , "Alexandre Courbot" , "Stephen Rothwell" To: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= From: "Danilo Krummrich" References: <20251027125148.7f7d8ed6@canb.auug.org.au> <22fl35khmbf6ufyjzbfvxor7b6nohqakqovjoya3v4mmlenz5c@6wbdednrd2pb> In-Reply-To: On Mon Oct 27, 2025 at 2:40 PM CET, Uwe Kleine-K=C3=B6nig 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 w= ould 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, ri= ght before the merge window opens. - Danilo