linux-kernel - linux-next: manual merge of the rust tree with the tip 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>] [day] [month] [year] [list]

Message-ID: <20250318195554.0ae541e0@canb.auug.org.au>
Date: Tue, 18 Mar 2025 19:55:54 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>, Thomas Gleixner <tglx@...utronix.de>,
 Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, Peter
 Zijlstra <peterz@...radead.org>
Cc: Benno Lossin <benno.lossin@...ton.me>, Boqun Feng
 <boqun.feng@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Mitchell Levy <levymitchell0@...il.com>
Subject: linux-next: manual merge of the rust tree with the tip tree

Hi all,

Today's linux-next merge of the rust tree got conflicts in:

  rust/kernel/sync/condvar.rs
  rust/kernel/sync/lock.rs

between commit:

  f73ca66f0d7f ("rust: lockdep: Use Pin for all LockClassKey usages")

from the tip tree and commit:

  dbd5058ba60c ("rust: make pin-init its own crate")

from the rust 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/sync/condvar.rs
index fbf68ada582f,c2535db9e0f8..000000000000
--- a/rust/kernel/sync/condvar.rs
+++ b/rust/kernel/sync/condvar.rs
@@@ -8,17 -8,14 +8,15 @@@
  use super::{lock::Backend, lock::Guard, LockClassKey};
  use crate::{
      ffi::{c_int, c_long},
-     init::PinInit,
-     pin_init,
      str::CStr,
 -    task::{MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE, TASK_NORMAL, TASK_UNINTERRUPTIBLE},
 +    task::{
 +        MAX_SCHEDULE_TIMEOUT, TASK_FREEZABLE, TASK_INTERRUPTIBLE, TASK_NORMAL, TASK_UNINTERRUPTIBLE,
 +    },
      time::Jiffies,
      types::Opaque,
  };
 -use core::marker::PhantomPinned;
 -use core::ptr;
 +use core::{marker::PhantomPinned, pin::Pin, ptr};
- use macros::pin_data;
+ use pin_init::{pin_data, pin_init, PinInit};

  /// Creates a [`CondVar`] initialiser with the given name and a newly-created lock class.
  #[macro_export]
diff --cc rust/kernel/sync/lock.rs
index 360a10a9216d,7f611b59ac57..000000000000
--- a/rust/kernel/sync/lock.rs
+++ b/rust/kernel/sync/lock.rs
@@@ -10,10 -10,8 +10,8 @@@ use crate::
      str::CStr,
      types::{NotThreadSafe, Opaque, ScopeGuard},
  };
 -use core::{cell::UnsafeCell, marker::PhantomPinned};
 +use core::{cell::UnsafeCell, marker::PhantomPinned, pin::Pin};
- use macros::pin_data;
+ use pin_init::{pin_data, pin_init, PinInit};

  pub mod mutex;
  pub mod spinlock;

Content of type "application/pgp-signature" skipped