linux-next: manual merge of the bitmap tree with the tip tree
Subsystems (2)
Mark Brown
maintainerHi 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.
rust/helpers/helpers.c +0 -0
@@@ -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"
[Cc Ingo, Thomas and Miguel for their awareness]
Quoted 6 lines · Mark Brown
Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
rust/helpers/helpers.c
Quoted 9 lines
between commit:
ed17707bd8f33("rust: sync: Add memory barriers")from the tip tree and commits:
ae384a4623fc3("rust: add bindings forbitops.h")78d9de4ca3474("rust: add bindings forbitmap.h")
Thank you for reporting and your resolution looks good to me.
Regards,
Boqun
Quoted 23 lines
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.
rust/helpers/helpers.c +2
-0@@@ -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"
Quoted 4 lines · Boqun Feng
[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