* linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree
@ 2024-10-01 0:28 Stephen Rothwell
2024-10-01 5:46 ` Miguel Ojeda
2024-10-07 22:56 ` Stephen Rothwell
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2024-10-01 0:28 UTC (permalink / raw)
To: Christian Brauner, Miguel Ojeda
Cc: Alice Ryhl, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
Hi all,
Today's linux-next merge of the fs-next tree got a conflict in:
rust/kernel/lib.rs
between commit:
ece207a83e46 ("rust: kernel: sort Rust modules")
from the rust-fixes tree and commit:
94d356c0335f ("rust: security: add abstraction for secctx")
from the vfs-brauner 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 b5f4b3ce6b48,ff7d88022c57..000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -44,8 -46,9 +46,9 @@@ pub mod net
pub mod page;
pub mod prelude;
pub mod print;
-pub mod sizes;
pub mod rbtree;
+ pub mod security;
+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] 5+ messages in thread* Re: linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree
2024-10-01 0:28 linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree Stephen Rothwell
@ 2024-10-01 5:46 ` Miguel Ojeda
2024-10-07 22:56 ` Stephen Rothwell
1 sibling, 0 replies; 5+ messages in thread
From: Miguel Ojeda @ 2024-10-01 5:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Christian Brauner, Miguel Ojeda, Alice Ryhl,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Oct 1, 2024 at 2:28 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the fs-next tree got a conflict in:
>
> rust/kernel/lib.rs
Looks good to me -- thanks!
Cheers,
Miguel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree
2024-10-01 0:28 linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree Stephen Rothwell
2024-10-01 5:46 ` Miguel Ojeda
@ 2024-10-07 22:56 ` Stephen Rothwell
2024-10-08 12:39 ` Christian Brauner
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2024-10-07 22:56 UTC (permalink / raw)
To: Christian Brauner
Cc: Miguel Ojeda, Alice Ryhl, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1312 bytes --]
Hi all,
On Tue, 1 Oct 2024 10:28:39 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the fs-next tree got a conflict in:
>
> rust/kernel/lib.rs
>
> between commit:
>
> ece207a83e46 ("rust: kernel: sort Rust modules")
>
> from the rust-fixes tree and commit:
>
> 94d356c0335f ("rust: security: add abstraction for secctx")
>
> from the vfs-brauner 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 b5f4b3ce6b48,ff7d88022c57..000000000000
> --- a/rust/kernel/lib.rs
> +++ b/rust/kernel/lib.rs
> @@@ -44,8 -46,9 +46,9 @@@ pub mod net
> pub mod page;
> pub mod prelude;
> pub mod print;
> -pub mod sizes;
> pub mod rbtree;
> + pub mod security;
> +pub mod sizes;
> mod static_assert;
> #[doc(hidden)]
> pub mod std_vendor;
This is now a conflict between the vfs-brauner tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree
2024-10-07 22:56 ` Stephen Rothwell
@ 2024-10-08 12:39 ` Christian Brauner
2024-10-08 14:01 ` Miguel Ojeda
0 siblings, 1 reply; 5+ messages in thread
From: Christian Brauner @ 2024-10-08 12:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Miguel Ojeda, Alice Ryhl, Linux Kernel Mailing List,
Linux Next Mailing List
On Tue, Oct 08, 2024 at 09:56:52AM GMT, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 1 Oct 2024 10:28:39 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the fs-next tree got a conflict in:
> >
> > rust/kernel/lib.rs
> >
> > between commit:
> >
> > ece207a83e46 ("rust: kernel: sort Rust modules")
> >
> > from the rust-fixes tree and commit:
> >
> > 94d356c0335f ("rust: security: add abstraction for secctx")
> >
> > from the vfs-brauner 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 b5f4b3ce6b48,ff7d88022c57..000000000000
> > --- a/rust/kernel/lib.rs
> > +++ b/rust/kernel/lib.rs
> > @@@ -44,8 -46,9 +46,9 @@@ pub mod net
> > pub mod page;
> > pub mod prelude;
> > pub mod print;
> > -pub mod sizes;
> > pub mod rbtree;
> > + pub mod security;
> > +pub mod sizes;
> > mod static_assert;
> > #[doc(hidden)]
> > pub mod std_vendor;
>
> This is now a conflict between the vfs-brauner tree and Linus' tree.
I rebased the rust bindings onto v6.12-rc2. So this conflict will go away.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree
2024-10-08 12:39 ` Christian Brauner
@ 2024-10-08 14:01 ` Miguel Ojeda
0 siblings, 0 replies; 5+ messages in thread
From: Miguel Ojeda @ 2024-10-08 14:01 UTC (permalink / raw)
To: Christian Brauner
Cc: Stephen Rothwell, Miguel Ojeda, Alice Ryhl,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Oct 8, 2024 at 2:39 PM Christian Brauner <brauner@kernel•org> wrote:
>
> I rebased the rust bindings onto v6.12-rc2. So this conflict will go away.
We are moving `AlwaysRefCounted` in `rust-next`, and the new code in
your branch uses it, so `next-20241008` does not build.
I can add a temporary re-export that we can clean up later on our
side, or I can drop the move for another time (it is not a big deal),
or we can put your branch on top of / into `rust-next`.
Cheers,
Miguel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-08 14:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-01 0:28 linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree Stephen Rothwell
2024-10-01 5:46 ` Miguel Ojeda
2024-10-07 22:56 ` Stephen Rothwell
2024-10-08 12:39 ` Christian Brauner
2024-10-08 14:01 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox