From: "Danilo Krummrich" <dakr@kernel•org>
To: "Andrew Morton" <akpm@linux-foundation•org>
Cc: "Stephen Rothwell" <sfr@canb•auug.org.au>,
"Simona Vetter" <simona.vetter@ffwll•ch>,
"Vitaly Wool" <vitaly.wool@konsulko•se>,
"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 mm-unstable tree with the drm-misc-fixes tree
Date: Wed, 13 Aug 2025 11:07:26 +0200 [thread overview]
Message-ID: <DC16J93QUQGV.4Z8STIPX6MGM@kernel.org> (raw)
In-Reply-To: <20250812205946.2db0d8645f3c2ed6c8828ae2@linux-foundation.org>
On Wed Aug 13, 2025 at 5:59 AM CEST, Andrew Morton wrote:
> Thanks.
>
> Well that's messy.
I think it's not too bad, the changes are just too close to each other -- no
semantic conflict.
As a general heads-up, Rust code is a bit more prone to conflicts.
On one hand this is due to the more powerful type system and components of
different subsystems being a bit closer connected to each other to provide
additional safety guarantees.
On the other hand, there's simply a lot of foundational work going on in
parallel.
For the Rust parts that are maintained under your mm tree, I think it should
generally stay well within limits though.
> Is it intended that the containing series ("Alloc and drm::Device
> fixes") be merged into 6.17-rcX?
Yes, not sure if it will be in -rc2 already, but should be in -rc3. So, the
conflict in -next should vanish in case you backmerge the corresponding -rc.
next prev parent reply other threads:[~2025-08-13 9:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-13 1:11 linux-next: manual merge of the mm-unstable tree with the drm-misc-fixes tree Stephen Rothwell
2025-08-13 3:59 ` Andrew Morton
2025-08-13 9:07 ` Danilo Krummrich [this message]
2025-08-13 8:50 ` Danilo Krummrich
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=DC16J93QUQGV.4Z8STIPX6MGM@kernel.org \
--to=dakr@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=simona.vetter@ffwll$(echo .)ch \
--cc=vitaly.wool@konsulko$(echo .)se \
/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