From: "Danilo Krummrich" <dakr@kernel•org>
To: "Stephen Rothwell" <sfr@canb•auug.org.au>
Cc: "Andrew Morton" <akpm@linux-foundation•org>,
"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 10:50:11 +0200 [thread overview]
Message-ID: <DC1661RBEB1Q.1Y748EK7YML1Y@kernel.org> (raw)
In-Reply-To: <20250813111151.6a261ca1@canb.auug.org.au>
On Wed Aug 13, 2025 at 3:11 AM CEST, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mm-unstable tree got a conflict in:
>
> rust/kernel/alloc/allocator.rs
>
> between commit:
>
> fde578c86281 ("rust: alloc: replace aligned_size() with Kmalloc::aligned_layout()")
>
> from the drm-misc-fixes tree and commit:
>
> cda097b07bce ("rust: support large alignments in allocations")
>
> from the mm-unstable 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.
Thanks, the resolution looks good!
prev parent reply other threads:[~2025-08-13 8:50 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
2025-08-13 8:50 ` 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=DC1661RBEB1Q.1Y748EK7YML1Y@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