From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Feb 2026 22:01:38 +0000 (-0800)
Subject: Merge tag 'configfs-for-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/a... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0901b6f9c807a6aa33dccedc548bf10c17a85c;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'configfs-for-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux

Pull configfs updates from Andreas Hindborg:

 - Switch the configfs rust bindings to use c string literals provided
   by the compiler, rather than a macro

 - A follow up on constifying `configfs_item_operations`, applying the
   change to the configfs sample

* tag 'configfs-for-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux:
  samples: configfs: Constify struct configfs_item_operations and configfs_group_operations
  rust: configfs: replace `kernel::c_str!` with C-Strings
---

8c0901b6f9c807a6aa33dccedc548bf10c17a85c
diff --cc drivers/block/rnull/configfs.rs
index 158f38bbbb8b7,6713a6d92391d..7c2eb5c0b7228
--- a/drivers/block/rnull/configfs.rs
+++ b/drivers/block/rnull/configfs.rs
@@@ -3,7 -3,7 +3,6 @@@
  use super::{NullBlkDevice, THIS_MODULE};
  use kernel::{
      block::mq::gen_disk::{GenDisk, GenDiskBuilder},
--    c_str,
      configfs::{self, AttributeOperations},
      configfs_attrs,
      fmt::{self, Write as _},