[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <2025090828-sushi-eternal-e09a@gregkh>
Date: Mon, 8 Sep 2025 10:57:35 +0200
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Arnd Bergmann <arnd@...db.de>, Alice Ryhl <aliceryhl@...gle.com>,
Daniel Almeida <daniel.almeida@...labora.com>,
Danilo Krummrich <dakr@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the
driver-core tree
On Mon, Sep 08, 2025 at 04:25:50PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> rust/kernel/lib.rs
>
> between commit:
>
> 1f54d5e5cd2a ("rust: irq: add irq module")
>
> from the driver-core tree and commit:
>
> 06cb58b310ea ("rust: iov: add iov_iter abstractions for ITER_SOURCE")
>
> from the char-misc 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 5300318a5309,99dbb7b2812e..000000000000
> --- a/rust/kernel/lib.rs
> +++ b/rust/kernel/lib.rs
> @@@ -93,7 -92,7 +93,8 @@@ pub mod fs
> pub mod init;
> pub mod io;
> pub mod ioctl;
> + pub mod iov;
> +pub mod irq;
> pub mod jump_label;
> #[cfg(CONFIG_KUNIT)]
> pub mod kunit;
Looks good, thanks!
greg k-h
Powered by blists - more mailing lists