* linux-next: manual merge of the bitmap tree with the char-misc, drm trees
@ 2025-09-22 10:14 Mark Brown
2025-09-22 12:20 ` Greg Kroah-Hartman
2025-09-22 14:59 ` Boqun Feng
0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2025-09-22 10:14 UTC (permalink / raw)
To: Yury Norov
Cc: Alice Ryhl, Boqun Feng, Burak Emir, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List, Matt Gilbride,
Peter Zijlstra, Wedson Almeida Filho
[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]
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"
[-- 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 char-misc, drm trees
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
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2025-09-22 12:20 UTC (permalink / raw)
To: Mark Brown
Cc: Yury Norov, Alice Ryhl, Boqun Feng, Burak Emir,
Linux Kernel Mailing List, Linux Next Mailing List, Matt Gilbride,
Peter Zijlstra, Wedson Almeida Filho
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the bitmap tree with the char-misc, drm trees
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
1 sibling, 0 replies; 3+ messages in thread
From: Boqun Feng @ 2025-09-22 14:59 UTC (permalink / raw)
To: Mark Brown
Cc: Yury Norov, Alice Ryhl, Burak Emir, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List, Matt Gilbride,
Peter Zijlstra, Wedson Almeida Filho
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-22 14:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox