From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>
Cc: Miguel Ojeda <ojeda@kernel•org>,
Alice Ryhl <aliceryhl@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the rust-fixes tree
Date: Tue, 8 Oct 2024 09:56:52 +1100 [thread overview]
Message-ID: <20241008095652.2247c731@canb.auug.org.au> (raw)
In-Reply-To: <20241001102839.77211fb8@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2024-10-07 22:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2024-10-08 12:39 ` Christian Brauner
2024-10-08 14:01 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241008095652.2247c731@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aliceryhl@google$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox