From: "Danilo Krummrich" <dakr@kernel.org>
To: "Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: "Miguel Ojeda" <ojeda@kernel.org>,
"Simona Vetter" <simona.vetter@ffwll.ch>,
"Alice Ryhl" <aliceryhl@google.com>,
"Intel Graphics" <intel-gfx@lists.freedesktop.org>,
"DRI" <dri-devel@lists.freedesktop.org>,
"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 rust tree with the drm-misc tree
Date: Wed, 16 Jul 2025 12:31:04 +0200 [thread overview]
Message-ID: <DBDES17FT4ZZ.GVIUKUE5R9SE@kernel.org> (raw)
In-Reply-To: <20250716201656.4f0ea8d7@canb.auug.org.au>
On Wed Jul 16, 2025 at 12:16 PM CEST, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/kernel/drm/gem/mod.rs
>
> between commit:
>
> 917b10d90990 ("drm: rust: rename as_ref() to from_raw() for drm constructors")
>
> from the drm-misc tree and commit:
>
> 8802e1684378 ("rust: types: add Opaque::cast_from")
>
> from the rust tree.
>
> I fixed it up (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.
Looks good to me, thanks!
prev parent reply other threads:[~2025-07-16 10:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 10:16 linux-next: manual merge of the rust tree with the drm-misc tree Stephen Rothwell
2025-07-16 10:31 ` 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=DBDES17FT4ZZ.GVIUKUE5R9SE@kernel.org \
--to=dakr@kernel.org \
--cc=aliceryhl@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=simona.vetter@ffwll.ch \
/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