From: "Danilo Krummrich" <dakr@kernel•org>
To: "Uwe Kleine-König" <ukleinek@kernel•org>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
"Michal Wilczynski" <m.wilczynski@samsung•com>,
"Boqun Feng" <boqun.feng@gmail•com>,
"Daniel Almeida" <daniel.almeida@collabora•com>,
"Peter Colberg" <pcolberg@redhat•com>,
"Lyude Paul" <lyude@redhat•com>,
"Miguel Ojeda" <ojeda@kernel•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Alice Ryhl" <aliceryhl@google•com>,
"Viresh Kumar" <viresh.kumar@linaro•org>,
"Alexandre Courbot" <acourbot@nvidia•com>,
"Stephen Rothwell" <sfr@canb•auug.org.au>
Subject: Re: linux-next: build failure after merge of the pwm tree
Date: Mon, 27 Oct 2025 14:49:54 +0100 [thread overview]
Message-ID: <DDT5IDT0GI4H.4GBFX9U17WU3@kernel.org> (raw)
In-Reply-To: <yohdkizrcgfyspfj5a4zarcu5b327aiskwwjth2k42q5q7p76l@qspcmydjnxk6>
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
next prev parent reply other threads:[~2025-10-27 13:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20251027015241eucas1p1784b974d0c150e8c3513f32401205669@eucas1p1.samsung.com>
2025-10-27 1:51 ` linux-next: build failure after merge of the pwm tree Stephen Rothwell
2025-10-27 8:11 ` Uwe Kleine-König
2025-10-27 9:38 ` Danilo Krummrich
2025-10-28 1:51 ` Stephen Rothwell
2025-12-05 3:33 ` Stephen Rothwell
2025-10-27 13:40 ` Uwe Kleine-König
2025-10-27 13:49 ` Danilo Krummrich [this message]
2025-10-28 9:52 ` linux-next: build failure after merge of the pwm tree' Alice Ryhl
2025-10-27 8:36 ` linux-next: build failure after merge of the pwm tree Michal Wilczynski
2023-12-21 5:58 Stephen Rothwell
2023-12-21 9:25 ` Thierry Reding
2023-12-21 10:09 ` Lee Jones
2023-12-21 12:13 ` Sean Young
2023-12-21 12:51 ` Lee Jones
-- strict thread matches above, loose matches on Subject: below --
2019-01-12 6:01 Stephen Rothwell
2019-01-12 6:08 ` Stephen Rothwell
2019-01-12 15:27 ` Uwe Kleine-König
2014-08-22 21:07 Stephen Rothwell
2014-08-22 22:06 ` Thierry Reding
2014-08-22 22:15 ` Thierry Reding
2014-08-22 22:30 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DDT5IDT0GI4H.4GBFX9U17WU3@kernel.org \
--to=dakr@kernel$(echo .)org \
--cc=acourbot@nvidia$(echo .)com \
--cc=aliceryhl@google$(echo .)com \
--cc=boqun.feng@gmail$(echo .)com \
--cc=daniel.almeida@collabora$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lyude@redhat$(echo .)com \
--cc=m.wilczynski@samsung$(echo .)com \
--cc=ojeda@kernel$(echo .)org \
--cc=pcolberg@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=ukleinek@kernel$(echo .)org \
--cc=viresh.kumar@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox