about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-05-02 15:03:42 +0200
committerGitHub <noreply@github.com>2017-05-02 15:03:42 +0200
commita841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67 (patch)
tree5258ac5985cec4ef4425c0ad9bc9045dc206bf0b /pkgs/top-level
parentcac205c25223f1839c453a2329334aed9f3920e1 (diff)
parentb5169fd2771d60a359af7263d84453adc0b5dbfb (diff)
downloadnixlib-a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67.tar
nixlib-a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67.tar.gz
nixlib-a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67.tar.bz2
nixlib-a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67.tar.lz
nixlib-a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67.tar.xz
nixlib-a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67.tar.zst
nixlib-a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67.zip
Merge pull request #25439 from NeQuissimus/linux_4_11_cgroups
linux: Add cgroups patches for 4.9, 4.10, 4.11
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67014b02d9c2..d7ba2652fe17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11716,10 +11716,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
-        # kernelPatches.cpu-cgroup-v2."4.7"
+        kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -11733,10 +11730,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
-        # kernelPatches.cpu-cgroup-v2."4.7"
+        kernelPatches.cpu-cgroup-v2."4.10"
         kernelPatches.modinst_arg_list_too_long
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -11752,8 +11746,7 @@ with pkgs;
         kernelPatches.p9_fixes
         # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
         # when adding a new linux version
-        # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
-        # kernelPatches.cpu-cgroup-v2."4.7"
+        kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")