From: "Danilo Krummrich" <dakr@kernel.org>
To: "Mark Brown" <broonie@kernel.org>
Cc: "Uwe Kleine-König" <ukleinek@kernel.org>,
"Guru Das Srinagesh" <linux@gurudas.dev>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pwm tree with the rust tree
Date: Tue, 11 Aug 2026 17:49:18 +0200 [thread overview]
Message-ID: <DKM8EPAHOTAD.1RAZ3DUAID3UK@kernel.org> (raw)
In-Reply-To: <ans961J686zSzNE6@sirena.org.uk>
Hi Mark,
The conflict should be between PWM and either drm-rust or driver-core, which
both share commit 7488dc14b05aa ("rust: io: mem: return DevresLt from
IoMem/ExclusiveIoMem::into_devres()") through a shared signed tag, depending on
what you merge first (I think it is drm-rust).
On Tue Aug 11, 2026 at 5:21 PM CEST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the pwm tree got a conflict in:
>
> drivers/pwm/pwm_th1520.rs
>
> between commit:
>
> 7488dc14b05aa ("rust: io: mem: return DevresLt from IoMem/ExclusiveIoMem::into_devres()")
>
> from the rust tree and commit:
>
> b4e94b0418ad6 ("pwm: th1520: use vertical import style")
>
> from the pwm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks!
prev parent reply other threads:[~2026-08-11 15:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-11 15:21 linux-next: manual merge of the pwm tree with the rust tree Mark Brown
2026-08-11 15:49 ` Danilo Krummrich [this message]
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=DKM8EPAHOTAD.1RAZ3DUAID3UK@kernel.org \
--to=dakr@kernel.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@gurudas.dev \
--cc=ukleinek@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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