From: "Danilo Krummrich" <dakr@kernel.org>
To: "Mark Brown" <broonie@kernel.org>
Cc: "Greg KH" <greg@kroah.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Alexandre Courbot" <acourbot@nvidia.com>,
"Gary Guo" <gary@garyguo.net>,
"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 driver-core tree with the drm-rust tree
Date: Mon, 27 Jul 2026 00:30:34 +0200 [thread overview]
Message-ID: <DK8UX7VAVTSN.2N7WV86AMAI5P@kernel.org> (raw)
In-Reply-To: <amaCtUBUZZ400yf3@sirena.org.uk>
On Sun Jul 26, 2026 at 11:57 PM CEST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/gpu/nova-core/gpu.rs
>
> between commit:
>
> f1aab4b1ab829 ("gpu: nova-core: avoid repeated calls to pci::Device::as_ref")
>
> from the drm-rust tree and commit:
>
> f7acb19abcd86 ("rust: device: make lifetime on `Core` and `CoreInternal` invariant")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
LGTM, thanks!
next prev parent reply other threads:[~2026-07-26 22:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-26 21:57 linux-next: manual merge of the driver-core tree with the drm-rust tree Mark Brown
2026-07-26 22:30 ` Danilo Krummrich [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-17 5:06 Stephen Rothwell
2025-11-17 14:47 ` Alice Ryhl
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=DK8UX7VAVTSN.2N7WV86AMAI5P@kernel.org \
--to=dakr@kernel.org \
--cc=acourbot@nvidia.com \
--cc=broonie@kernel.org \
--cc=gary@garyguo.net \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rafael@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