diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 99a187200997..6593b0d5e294 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -321,6 +321,7 @@ let NET_CLS_BPF = module; NET_ACT_BPF = module; NET_SCHED = yes; + NET_SCH_BPF = whenAtLeast "6.16" yes; L2TP_V3 = yes; L2TP_IP = module; L2TP_ETH = module; @@ -653,6 +654,8 @@ let # default to dual role mode USB_DWC2_DUAL_ROLE = yes; USB_DWC3_DUAL_ROLE = yes; + + USB_XHCI_SIDEBAND = whenAtLeast "6.16" yes; # needed for audio offload }; usb-serial = { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 2e159ff1e971..4207dbe6b729 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,5 +30,9 @@ "6.15": { "version": "6.15.8", "hash": "sha256:19i87zpq3zhpg09sdirnzys2s2yrv9xn8mpibl1a6qmr2sy94znk" + }, + "6.16": { + "version": "6.16", + "hash": "sha256:10ydzfzc3g0nhns6md08gpfshhjcyd58lylqr15alijjdgzf4jqs" } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ae05201e429..c997b2d40ca7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1132,6 +1132,7 @@ mapAliases { linuxPackages_6_13 = linuxKernel.packages.linux_6_13; linuxPackages_6_14 = linuxKernel.packages.linux_6_14; linuxPackages_6_15 = linuxKernel.packages.linux_6_15; + linuxPackages_6_16 = linuxKernel.packages.linux_6_16; linuxPackages_ham = linuxKernel.packages.linux_ham; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -1156,6 +1157,7 @@ mapAliases { linux_6_13 = linuxKernel.kernels.linux_6_13; linux_6_14 = linuxKernel.kernels.linux_6_14; linux_6_15 = linuxKernel.kernels.linux_6_15; + linux_6_16 = linuxKernel.kernels.linux_6_16; linux_ham = linuxKernel.kernels.linux_ham; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 837f2d3a51bb..8eecf46610d2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -219,6 +219,14 @@ in ]; }; + linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.16"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { @@ -732,6 +740,7 @@ in linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15); + linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16); } // lib.optionalAttrs config.allowAliases { linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 @@ -801,7 +810,7 @@ in packageAliases = { linux_default = packages.linux_6_12; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_15; + linux_latest = packages.linux_6_16; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; }