public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Benno Lossin <lossin@kernel•org>
Cc: Danilo Krummrich <dakr@kernel•org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the rust-pin-init tree with Linus' tree
Date: Fri, 12 Sep 2025 13:51:46 +1000	[thread overview]
Message-ID: <20250912135146.0c3ea18f@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2993 bytes --]

Hi all,

Today's linux-next merge of the rust-pin-init tree got a conflict in:

  rust/kernel/devres.rs

between commit:

  75a7b151e808 ("rust: devres: fix leaking call to devm_add_action()")

from Linus' tree and commit:

  42415d163e5d ("rust: pin-init: add references to previously initialized fields")

from the rust-pin-init 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/devres.rs
index 132545962218,91dbf3f4b166..000000000000
--- a/rust/kernel/devres.rs
+++ b/rust/kernel/devres.rs
@@@ -135,21 -134,11 +135,19 @@@ impl<T: Send> Devres<T> 
          T: 'a,
          Error: From<E>,
      {
-         let callback = Self::devres_callback;
- 
          try_pin_init!(&this in Self {
              dev: dev.into(),
-             callback,
+             callback: Self::devres_callback,
              // INVARIANT: `inner` is properly initialized.
 -            inner <- {
 +            inner <- Opaque::pin_init(try_pin_init!(Inner {
 +                    devm <- Completion::new(),
 +                    revoke <- Completion::new(),
 +                    data <- Revocable::new(data),
 +            })),
 +            // TODO: Replace with "initializer code blocks" [1] once available.
 +            //
 +            // [1] https://github.com/Rust-for-Linux/pin-init/pull/69
 +            _add_action: {
                  // SAFETY: `this` is a valid pointer to uninitialized memory.
                  let inner = unsafe { &raw mut (*this.as_ptr()).inner };
  
@@@ -160,14 -149,14 +158,14 @@@
                  //    properly initialized, because we require `dev` (i.e. the *bound* device) to
                  //    live at least as long as the returned `impl PinInit<Self, Error>`.
                  to_result(unsafe {
-                     bindings::devm_add_action(dev.as_raw(), Some(callback), inner.cast())
+                     bindings::devm_add_action(dev.as_raw(), Some(*callback), inner.cast())
 -                })?;
 +                }).inspect_err(|_| {
 +                    let inner = Opaque::cast_into(inner);
  
 -                Opaque::pin_init(try_pin_init!(Inner {
 -                    devm <- Completion::new(),
 -                    revoke <- Completion::new(),
 -                    data <- Revocable::new(data),
 -                }))
 +                    // SAFETY: `inner` is a valid pointer to an `Inner<T>` and valid for both reads
 +                    // and writes.
 +                    unsafe { core::ptr::drop_in_place(inner) };
 +                })?;
              },
          })
      }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2025-09-12  3:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-12  3:51 Stephen Rothwell [this message]
2025-09-12  7:58 ` linux-next: manual merge of the rust-pin-init tree with Linus' tree Danilo Krummrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250912135146.0c3ea18f@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=dakr@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=lossin@kernel$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox