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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250908162550.1a250f96@canb.auug.org.au>
Date: Mon, 8 Sep 2025 16:25:50 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc: Alice Ryhl <aliceryhl@...gle.com>, Daniel Almeida
 <daniel.almeida@...labora.com>, Danilo Krummrich <dakr@...nel.org>, Greg
 Kroah-Hartman <gregkh@...uxfoundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the char-misc tree with the driver-core
 tree

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;

Content of type "application/pgp-signature" skipped