From: Boqun Feng <boqun.feng@gmail•com>
To: Mark Brown <broonie@kernel•org>
Cc: Yury Norov <yury.norov@gmail•com>, Burak Emir <bqe@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Peter Zijlstra <peterz@infradead•org>,
Thomas Gleixner <tglx@linutronix•de>,
mingo@kernel•org, Miguel Ojeda <ojeda@kernel•org>
Subject: Re: linux-next: manual merge of the bitmap tree with the tip tree
Date: Mon, 15 Sep 2025 19:43:41 -0400 [thread overview]
Message-ID: <aMikrcaVbSYdkdmW@tardis-2.local> (raw)
In-Reply-To: <aMiZpcBu2LDzwCje@sirena.org.uk>
[Cc Ingo, Thomas and Miguel for their awareness]
On Mon, Sep 15, 2025 at 11:56:37PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the bitmap tree got a conflict in:
>
> rust/helpers/helpers.c
>
> between commit:
>
> ed17707bd8f33 ("rust: sync: Add memory barriers")
>
> from the tip tree and commits:
>
> ae384a4623fc3 ("rust: add bindings for bitops.h")
> 78d9de4ca3474 ("rust: add bindings for bitmap.h")
>
Thank you for reporting and your resolution looks good to me.
Regards,
Boqun
> from the bitmap 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.
>
> diff --cc rust/helpers/helpers.c
> index a16758a6ef395,abff1ef14d813..0000000000000
> --- a/rust/helpers/helpers.c
> +++ b/rust/helpers/helpers.c
> @@@ -8,7 -8,8 +8,9 @@@
> */
>
> #include "auxiliary.c"
> +#include "barrier.c"
> + #include "bitmap.c"
> + #include "bitops.c"
> #include "blk.c"
> #include "bug.c"
> #include "build_assert.c"
next prev parent reply other threads:[~2025-09-15 23:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 22:56 linux-next: manual merge of the bitmap tree with the tip tree Mark Brown
2025-09-15 23:43 ` Boqun Feng [this message]
2025-09-16 0:04 ` Miguel Ojeda
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=aMikrcaVbSYdkdmW@tardis-2.local \
--to=boqun.feng@gmail$(echo .)com \
--cc=bqe@google$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=ojeda@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=yury.norov@gmail$(echo .)com \
/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