Skip to content

rust: block: use pin_init::zeroed#521

Open
blktests-ci[bot] wants to merge 2 commits intolinus-master_basefrom
series/1048337=>linus-master
Open

rust: block: use pin_init::zeroed#521
blktests-ci[bot] wants to merge 2 commits intolinus-master_basefrom
series/1048337=>linus-master

Conversation

@blktests-ci
Copy link

@blktests-ci blktests-ci bot commented Jan 29, 2026

Pull request for series with
subject: rust: block: use pin_init::zeroed
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1048337

@blktests-ci
Copy link
Author

blktests-ci bot commented Jan 29, 2026

Upstream branch: 8dfce89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048337
version: 1

@blktests-ci
Copy link
Author

blktests-ci bot commented Jan 29, 2026

Upstream branch: 8dfce89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

@blktests-ci blktests-ci bot added V2 and removed V1 labels Jan 29, 2026
@blktests-ci blktests-ci bot force-pushed the series/1048337=>linus-master branch from 32cb643 to 17a76c7 Compare January 29, 2026 03:14
@blktests-ci
Copy link
Author

blktests-ci bot commented Jan 29, 2026

Upstream branch: 8dfce89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

@blktests-ci blktests-ci bot force-pushed the series/1048337=>linus-master branch from 17a76c7 to 479e227 Compare January 29, 2026 05:33
@blktests-ci blktests-ci bot force-pushed the linus-master_base branch from 483aa43 to 9d3c6de Compare February 3, 2026 19:06
@blktests-ci
Copy link
Author

blktests-ci bot commented Feb 3, 2026

Upstream branch: de0674d
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

@blktests-ci blktests-ci bot force-pushed the series/1048337=>linus-master branch from 479e227 to f41ed26 Compare February 3, 2026 19:08
@blktests-ci blktests-ci bot force-pushed the linus-master_base branch from 9d3c6de to 7c2ae0a Compare February 5, 2026 03:28
@blktests-ci
Copy link
Author

blktests-ci bot commented Feb 5, 2026

Upstream branch: f14faaf
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

@blktests-ci blktests-ci bot force-pushed the series/1048337=>linus-master branch from f41ed26 to 1c9e52b Compare February 5, 2026 03:30
@blktests-ci blktests-ci bot force-pushed the linus-master_base branch from 7c2ae0a to 54294d6 Compare February 6, 2026 08:51
@blktests-ci
Copy link
Author

blktests-ci bot commented Feb 6, 2026

Upstream branch: b7ff715
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

@blktests-ci blktests-ci bot force-pushed the series/1048337=>linus-master branch from 1c9e52b to cacb3cc Compare February 6, 2026 08:58
@blktests-ci blktests-ci bot force-pushed the linus-master_base branch from 54294d6 to eb49f7b Compare February 8, 2026 02:55
@blktests-ci
Copy link
Author

blktests-ci bot commented Feb 8, 2026

Upstream branch: e7aa572
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

@blktests-ci blktests-ci bot force-pushed the series/1048337=>linus-master branch from cacb3cc to dd7373f Compare February 8, 2026 04:21
@blktests-ci blktests-ci bot force-pushed the linus-master_base branch from eb49f7b to 30e5c22 Compare February 9, 2026 04:29
@blktests-ci
Copy link
Author

blktests-ci bot commented Feb 9, 2026

Upstream branch: 05f7e89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

Replace manual unsafe zeroing of block structures with the safe
pin_init::zeroed() helper.

Suggested-by: Benno Lossin <lossin@kernel.org>
Link: Rust-for-Linux/linux#1189
Signed-off-by: Jason Hall <jason.kei.hall@gmail.com>
Reviewed-by: Onur Özkan <work@onurozkan.dev>
@blktests-ci blktests-ci bot force-pushed the series/1048337=>linus-master branch from dd7373f to 244fe24 Compare February 9, 2026 04:36
@blktests-ci blktests-ci bot force-pushed the linus-master_base branch from 30e5c22 to 519f160 Compare February 12, 2026 00:34
@blktests-ci
Copy link
Author

blktests-ci bot commented Feb 12, 2026

Upstream branch: c22e26b
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048342
version: 2

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: rust: block: use pin_init::zeroed
Using index info to reconstruct a base tree...
M	rust/kernel/block/mq/gen_disk.rs
M	rust/kernel/block/mq/tag_set.rs
Falling back to patching base and 3-way merge...
Auto-merging rust/kernel/block/mq/gen_disk.rs
CONFLICT (content): Merge conflict in rust/kernel/block/mq/gen_disk.rs
Patch failed at 0001 rust: block: use pin_init::zeroed'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc rust/kernel/block/mq/gen_disk.rs
index c8b0ecb17082,649c3d9b1ff9..000000000000
--- a/rust/kernel/block/mq/gen_disk.rs
+++ b/rust/kernel/block/mq/gen_disk.rs
@@@ -106,7 -106,6 +106,10 @@@ impl GenDiskBuilder 
              // SAFETY: T::QueueData was created by the call to `into_foreign()` above
              drop(unsafe { T::QueueData::from_foreign(data) });
          });
++<<<<<<< HEAD
 +
++=======
++>>>>>>> rust: block: use pin_init::zeroed
          let mut lim: bindings::queue_limits = pin_init::zeroed();
  
          lim.logical_block_size = self.logical_block_size;

@blktests-ci blktests-ci bot force-pushed the linus-master_base branch 9 times, most recently from e1fefe2 to f714aad Compare February 18, 2026 05:50
@blktests-ci blktests-ci bot force-pushed the linus-master_base branch 4 times, most recently from c90f83b to c475e20 Compare February 25, 2026 11:14
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.

2 participants