* linux-next: manual merge of the rust tree with the net-next tree
@ 2024-09-02 6:04 Stephen Rothwell
2024-09-02 6:34 ` Miguel Ojeda
2024-09-24 0:50 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-09-02 6:04 UTC (permalink / raw)
To: Miguel Ojeda, David Miller, Jakub Kicinski, Paolo Abeni
Cc: Networking, FUJITA Tomonori, Linux Kernel Mailing List,
Linux Next Mailing List, Matt Gilbride, Wedson Almeida Filho
[-- Attachment #1: Type: text/plain, Size: 1070 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/kernel/lib.rs
between commit:
4d080a029db1 ("rust: sizes: add commonly used constants")
from the net-next tree and commit:
a0d13aac7022 ("rust: rbtree: add red-black tree implementation backed by the C version")
from the rust 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.
--
Cheers,
Stephen Rothwell
diff --cc rust/kernel/lib.rs
index 58ed400198bf,f10b06a78b9d..000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -43,7 -44,7 +44,8 @@@ pub mod net
pub mod page;
pub mod prelude;
pub mod print;
+ pub mod rbtree;
+pub mod sizes;
mod static_assert;
#[doc(hidden)]
pub mod std_vendor;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the rust tree with the net-next tree
2024-09-02 6:04 linux-next: manual merge of the rust tree with the net-next tree Stephen Rothwell
@ 2024-09-02 6:34 ` Miguel Ojeda
2024-09-24 0:50 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Miguel Ojeda @ 2024-09-02 6:34 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Miguel Ojeda, David Miller, Jakub Kicinski, Paolo Abeni,
Networking, FUJITA Tomonori, Linux Kernel Mailing List,
Linux Next Mailing List, Matt Gilbride, Wedson Almeida Filho
On Mon, Sep 2, 2024 at 8:04 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary. This
Looks good, thanks!
Cheers,
Miguel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the rust tree with the net-next tree
2024-09-02 6:04 linux-next: manual merge of the rust tree with the net-next tree Stephen Rothwell
2024-09-02 6:34 ` Miguel Ojeda
@ 2024-09-24 0:50 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-09-24 0:50 UTC (permalink / raw)
To: Miguel Ojeda, David Miller, Jakub Kicinski, Paolo Abeni
Cc: Networking, FUJITA Tomonori, Linux Kernel Mailing List,
Linux Next Mailing List, Matt Gilbride, Wedson Almeida Filho
[-- Attachment #1: Type: text/plain, Size: 1288 bytes --]
Hi all,
On Mon, 2 Sep 2024 16:04:36 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/kernel/lib.rs
>
> between commit:
>
> 4d080a029db1 ("rust: sizes: add commonly used constants")
>
> from the net-next tree and commit:
>
> a0d13aac7022 ("rust: rbtree: add red-black tree implementation backed by the C version")
>
> from the rust 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/kernel/lib.rs
> index 58ed400198bf,f10b06a78b9d..000000000000
> --- a/rust/kernel/lib.rs
> +++ b/rust/kernel/lib.rs
> @@@ -43,7 -44,7 +44,8 @@@ pub mod net
> pub mod page;
> pub mod prelude;
> pub mod print;
> + pub mod rbtree;
> +pub mod sizes;
> mod static_assert;
> #[doc(hidden)]
> pub mod std_vendor;
This is now a conflict between the rust tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-24 0:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-02 6:04 linux-next: manual merge of the rust tree with the net-next tree Stephen Rothwell
2024-09-02 6:34 ` Miguel Ojeda
2024-09-24 0:50 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox