diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index aa7ac85312da44e..116f88ad19b63c7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -459,6 +459,9 @@ let # Enable AMD secure display when available DRM_AMD_SECURE_DISPLAY = whenAtLeast "5.13" yes; + # Enable AMD image signal processor + DRM_AMD_ISP = whenAtLeast "6.11" yes; + # Enable new firmware (and by extension NVK) for compatible hardware on Nouveau DRM_NOUVEAU_GSP_DEFAULT = whenAtLeast "6.8" yes; @@ -719,6 +722,10 @@ let # Enable stack smashing protections in schedule() # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f SCHED_STACK_END_CHECK = yes; + + # Enable separate slab buckets for user controlled allocations + # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=67f2df3b82d091ed095d0e47e1f3a9d3e18e4e41 + SLAB_BUCKETS = whenAtLeast "6.11" yes; } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5007b5bf8ccc837..ce729e618e43e82 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -38,5 +38,9 @@ "6.10": { "version": "6.10.10", "hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6" + }, + "6.11": { + "version": "6.11", + "hash": "sha256:0bnbvadm4wvnwzcq319gsgl03ijvvljn7mj8qw87ihpb4p0cdljm" } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b0fb07ba17412b7..4e5a8edb0b1ebe8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -705,6 +705,7 @@ mapAliases ({ linuxPackages_6_8 = linuxKernel.packages.linux_6_8; linuxPackages_6_9 = linuxKernel.packages.linux_6_9; linuxPackages_6_10 = linuxKernel.packages.linux_6_10; + linuxPackages_6_11 = linuxKernel.packages.linux_6_11; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -734,6 +735,7 @@ mapAliases ({ linux_6_8 = linuxKernel.kernels.linux_6_8; linux_6_9 = linuxKernel.kernels.linux_6_9; linux_6_10 = linuxKernel.kernels.linux_6_10; + linux_6_11 = linuxKernel.kernels.linux_6_11; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a2842c5f20d8a54..6813d430a46949d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -193,6 +193,14 @@ in { ]; }; + linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.11"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -608,6 +616,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); + linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -679,7 +688,7 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_10; + linux_latest = packages.linux_6_11; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6;