linux-next: manual merge of the char-misc tree with the driver-core tree

Posted by Stephen Rothwell 3 weeks, 3 days ago

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;

Re: linux-next: manual merge of the char-misc tree with the driver-core tree

Posted by Greg KH 3 weeks, 3 days ago

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