* linux-next: manual merge of the bitmap tree with the tip tree
@ 2025-09-15 22:56 Mark Brown
2025-09-15 23:43 ` Boqun Feng
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2025-09-15 22:56 UTC (permalink / raw)
To: Yury Norov
Cc: Boqun Feng, Burak Emir, Linux Kernel Mailing List,
Linux Next Mailing List, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]
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")
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"
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the bitmap tree with the tip tree
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
2025-09-16 0:04 ` Miguel Ojeda
0 siblings, 1 reply; 3+ messages in thread
From: Boqun Feng @ 2025-09-15 23:43 UTC (permalink / raw)
To: Mark Brown
Cc: Yury Norov, Burak Emir, Linux Kernel Mailing List,
Linux Next Mailing List, Peter Zijlstra, Thomas Gleixner, mingo,
Miguel Ojeda
[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"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the bitmap tree with the tip tree
2025-09-15 23:43 ` Boqun Feng
@ 2025-09-16 0:04 ` Miguel Ojeda
0 siblings, 0 replies; 3+ messages in thread
From: Miguel Ojeda @ 2025-09-16 0:04 UTC (permalink / raw)
To: Boqun Feng
Cc: Mark Brown, Yury Norov, Burak Emir, Linux Kernel Mailing List,
Linux Next Mailing List, Peter Zijlstra, Thomas Gleixner, mingo,
Miguel Ojeda
On Tue, Sep 16, 2025 at 1:43 AM Boqun Feng <boqun.feng@gmail•com> wrote:
>
> [Cc Ingo, Thomas and Miguel for their awareness]
>
> Thank you for reporting and your resolution looks good to me.
Thanks Boqun, looks good to me too.
Cheers,
Miguel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-16 0:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2025-09-16 0:04 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox