linux-next: manual merge of the bitmap tree with the char-misc, drm trees

Posted by Mark Brown 1 week, 2 days ago

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"

Re: linux-next: manual merge of the bitmap tree with the char-misc, drm trees

Posted by Boqun Feng 1 week, 2 days ago

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

Re: linux-next: manual merge of the bitmap tree with the char-misc, drm trees

Posted by Greg Kroah-Hartman 1 week, 2 days ago

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"

Looks correct to me, thanks

greg k-h