Merge 039bc24955 into 52113c4f5c

Merge pull request #1668 from concatime/fix/rename-modules
Rename some modules to their correct names
2025-11-09 16:16:21 +01:00 · 2025-11-06 22:48:29 -05:00 · 2025-11-06 21:07:11 +00:00 · 2025-11-06 15:05:04 -05:00 · 2025-11-06 15:05:04 -05:00 · 2025-10-29 18:22:25 +01:00
8 changed files with 12 additions and 12 deletions
--- a/dell/precision/7520/default.nix
+++ b/dell/precision/7520/default.nix
@ -15,7 +15,7 @@
  boot.initrd.availableKernelModules = [
    "xhci_pci"
    "ahci"
-    "usb_storage"
+    "usb-storage"
    "sd_mod"
    "rtsx_pci_sdmmc"
  ];
--- a/focus/m2/gen1/default.nix
+++ b/focus/m2/gen1/default.nix
@ -13,7 +13,7 @@
    "xhci_pci"
    "ahci"
    "nvme"
-    "usb_storage"
+    "usb-storage"
    "sd_mod"
    "rtsx_pci_sdmmc"
  ];
--- a/microsoft/surface/common/default.nix
+++ b/microsoft/surface/common/default.nix
@ -19,7 +19,7 @@ let
    if kernelVersion == "longterm" then
      "6.12.19"
    else if kernelVersion == "stable" then
-      "6.15.9"
+      "6.17.6"
    else
      abort "Invalid kernel version: ${kernelVersion}";

@ -28,7 +28,7 @@ let
    if kernelVersion == "longterm" then
      "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="
    else if kernelVersion == "stable" then
-      "sha256-6U86+FSSMC96gZRBRY+AvKCtmRLlpMg8aZ/zxjxSlX0="
+      "sha256-js+8a2k0SKu0YUSo0E0eFjFjnHZhwQiEJaLlQG8Txpw="
    else
      abort "Invalid kernel version: ${kernelVersion}";

@ -38,7 +38,7 @@ let
    if kernelVersion == "longterm" then
      "6.12.7"
    else if kernelVersion == "stable" then
-      "6.15.3"
+      "6.17.1"
    else
      abort "Invalid kernel version: ${kernelVersion}";

@ -47,7 +47,7 @@ let
    if kernelVersion == "longterm" then
      "sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
    else if kernelVersion == "stable" then
-      "sha256-ozvYrZDiVtMkdCcVnNEdlF2Kdw4jivW0aMJrDynN3Hk="
+      "sha256-VEoZH3dFsLn9GnUyjnbOoJeTRM3KEQ9fhlMk03NXoXs="
    else
      abort "Invalid kernel version: ${kernelVersion}";

--- a/microsoft/surface/common/kernel/6.17/patches.nix
+++ b/microsoft/surface/common/kernel/6.17/patches.nix
--- a/purism/librem/5r4/initrd.nix
+++ b/purism/librem/5r4/initrd.nix
@ -14,7 +14,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
      "tps6598x"
      "xhci_hcd"
      "usbcore"
-      "usb_storage"
+      "usb-storage"
      "uas"
      "xhci_plat_hcd"
    ];
@ -56,7 +56,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
      "tps6598x"
      "xhci_hcd"
      "usbcore"
-      "usb_storage"
+      "usb-storage"
      "uas"
      "xhci_plat_hcd"
    ];
--- a/raspberry-pi/3/default.nix
+++ b/raspberry-pi/3/default.nix
@ -9,7 +9,7 @@
    kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
    initrd.availableKernelModules = [
      "usbhid"
-      "usb_storage"
+      "usb-storage"
    ];
  };

--- a/raspberry-pi/4/default.nix
+++ b/raspberry-pi/4/default.nix
@ -31,9 +31,9 @@
    kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4;
    initrd.availableKernelModules = [
      "usbhid"
-      "usb_storage"
+      "usb-storage"
      "vc4"
-      "pcie_brcmstb" # required for the pcie bus to work
+      "pcie-brcmstb" # required for the pcie bus to work
      "reset-raspberrypi" # required for vl805 firmware to load
    ]
    ++ lib.optional config.boot.initrd.network.enable "genet";
--- a/raspberry-pi/5/default.nix
+++ b/raspberry-pi/5/default.nix
@ -16,7 +16,7 @@ in
    initrd.availableKernelModules = [
      "nvme"
      "usbhid"
-      "usb_storage"
+      "usb-storage"
    ];
  };
Author	SHA1	Message	Date
Matthias	2cb0d0889c	Merge `039bc24955` into `52113c4f5c`	2025-11-06 22:48:29 -05:00
Jörg Thalheim	52113c4f5c	Merge pull request #1668 from concatime/fix/rename-modules Rename some modules to their correct names	2025-11-06 21:07:11 +00:00
Issam E. Maghni	fc4c7c6ec7	meta: rename module to pcie-brcmstb https://github.com/torvalds/linux/blob/v6.17/drivers/pci/controller/Makefile#L37	2025-11-06 15:05:04 -05:00
Issam E. Maghni	744975050f	meta: rename module to usb-storage https://github.com/torvalds/linux/blob/v6.17/drivers/usb/storage/Kconfig#L23-L24 > To compile this driver as a module, choose M here: the > module will be called usb-storage.	2025-11-06 15:05:04 -05:00
matthiasdotsh	039bc24955	surface: linux 6.15.3 -> 6.17.6	2025-10-29 18:22:25 +01:00