From: Alice Ryhl <aliceryhl@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Danilo Krummrich <dakr@kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Alexandre Courbot <acourbot@nvidia.com>,
Alistair Popple <apopple@nvidia.com>,
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, 17 Nov 2025 14:47:33 +0000 [thread overview]
Message-ID: <aRs1hb001g4n6vBX@google.com> (raw)
In-Reply-To: <20251117160621.2043a859@canb.auug.org.au>
On Mon, Nov 17, 2025 at 04:06:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/gpu/nova-core/driver.rs
>
> between commit:
>
> 1101c442410c ("gpu: nova-core: Set correct DMA mask")
>
> from the drm-rust tree and commits:
>
> 0242623384c7 ("rust: driver: let probe() return impl PinInit<Self, Error>")
> e4e679c8608e ("rust: auxiliary: unregister on parent device unbind")
>
> from the driver-core tree.
>
> I fixed it up (I think - see below) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Thanks! Looks good.
Alice
prev parent reply other threads:[~2025-11-17 14:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-17 5:06 linux-next: manual merge of the driver-core tree with the drm-rust tree Stephen Rothwell
2025-11-17 14:47 ` Alice Ryhl [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=aRs1hb001g4n6vBX@google.com \
--to=aliceryhl@google.com \
--cc=acourbot@nvidia.com \
--cc=apopple@nvidia.com \
--cc=dakr@kernel.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=sfr@canb.auug.org.au \
/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