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: <20241001102839.77211fb8@canb.auug.org.au>
Date: Tue, 1 Oct 2024 10:28:39 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christian Brauner <brauner@...nel.org>, Miguel Ojeda <ojeda@...nel.org>
Cc: Alice Ryhl <aliceryhl@...gle.com>, 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 vfs-brauner tree with the
 rust-fixes tree

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;

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ