From: Boqun Feng <boqun.feng@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Yury Norov <yury.norov@gmail.com>,
Alice Ryhl <aliceryhl@google.com>, Burak Emir <bqe@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matt Gilbride <mattgilbride@google.com>,
Peter Zijlstra <peterz@infradead.org>,
Wedson Almeida Filho <wedsonaf@gmail.com>
Subject: Re: linux-next: manual merge of the bitmap tree with the char-misc, drm trees
Date: Mon, 22 Sep 2025 07:59:41 -0700 [thread overview]
Message-ID: <aNFkXUUDtJ-Y4rJZ@tardis.local> (raw)
In-Reply-To: <aNEhcEFTsdPXmtVi@finisterre.sirena.org.uk>
On Mon, Sep 22, 2025 at 12:14:08PM +0200, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the bitmap tree got a conflict in:
>
> rust/helpers/helpers.c
>
> between commits:
>
> eafedbc7c050c ("rust_binder: add Rust Binder driver")
> d9ea5a41cef80 ("rust: sync: Add memory barriers")
>
> from the char-misc, drm trees and commits:
>
> 78d9de4ca3474 ("rust: add bindings for bitmap.h")
> ae384a4623fc3 ("rust: add bindings for bitops.h")
>
> 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 3d7d0b40c9f13,abff1ef14d813..0000000000000
> --- a/rust/helpers/helpers.c
> +++ b/rust/helpers/helpers.c
> @@@ -7,10 -7,9 +7,12 @@@
> * Sorted alphabetically.
> */
>
> +#include "atomic.c"
> #include "auxiliary.c"
> +#include "barrier.c"
> +#include "binder.c"
> + #include "bitmap.c"
> + #include "bitops.c"
> #include "blk.c"
> #include "bug.c"
> #include "build_assert.c"
LGTM, thanks!
Regards,
Boqun
prev parent reply other threads:[~2025-09-22 14:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-22 10:14 linux-next: manual merge of the bitmap tree with the char-misc, drm trees Mark Brown
2025-09-22 12:20 ` Greg Kroah-Hartman
2025-09-22 14:59 ` Boqun Feng [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=aNFkXUUDtJ-Y4rJZ@tardis.local \
--to=boqun.feng@gmail.com \
--cc=aliceryhl@google.com \
--cc=bqe@google.com \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mattgilbride@google.com \
--cc=peterz@infradead.org \
--cc=wedsonaf@gmail.com \
--cc=yury.norov@gmail.com \
/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