Skip to content

Fix missing fops.owner in Rust DRM/misc abstractions#988

Open
blktests-ci[bot] wants to merge 1 commit into
for-next_basefrom
series/1114444=>for-next
Open

Fix missing fops.owner in Rust DRM/misc abstractions#988
blktests-ci[bot] wants to merge 1 commit into
for-next_basefrom
series/1114444=>for-next

Conversation

@blktests-ci

@blktests-ci blktests-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown

Pull request for series with
subject: Fix missing fops.owner in Rust DRM/misc abstractions
version: 4
url: https://patchwork.kernel.org/project/linux-block/list/?series=1115117

@blktests-ci

blktests-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Author

Upstream branch: 5c7804e
series: https://patchwork.kernel.org/project/linux-block/list/?series=1115117
version: 4

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1115117
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: rust: module: move module types into `module.rs`
Using index info to reconstruct a base tree...
M	rust/kernel/auxiliary.rs
M	rust/kernel/i2c.rs
M	rust/kernel/lib.rs
M	rust/kernel/pci.rs
M	rust/kernel/platform.rs
M	rust/kernel/usb.rs
Falling back to patching base and 3-way merge...
Auto-merging rust/kernel/usb.rs
Auto-merging rust/kernel/platform.rs
CONFLICT (content): Merge conflict in rust/kernel/platform.rs
Auto-merging rust/kernel/pci.rs
Auto-merging rust/kernel/lib.rs
Auto-merging rust/kernel/i2c.rs
Auto-merging rust/kernel/auxiliary.rs
Patch failed at 0001 rust: module: move module types into `module.rs`
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc rust/kernel/platform.rs
index 9b362e0495d3,9fdbafd53bc2..000000000000
--- a/rust/kernel/platform.rs
+++ b/rust/kernel/platform.rs
@@@ -82,9 -82,7 +82,13 @@@ unsafe impl<T: Driver> driver::Registra
          }
  
          // SAFETY: `pdrv` is guaranteed to be a valid `DriverType`.
++<<<<<<< HEAD
 +        to_result(unsafe {
 +            bindings::__platform_driver_register(pdrv.get(), module.0, name.as_char_ptr())
 +        })
++=======
+         to_result(unsafe { bindings::__platform_driver_register(pdrv.get(), module.as_ptr()) })
++>>>>>>> rust: module: move module types into `module.rs`
      }
  
      unsafe fn unregister(pdrv: &Opaque<Self::DriverType>) {

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants