diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-26 06:07:16 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-26 06:07:16 -0400 |
| commit | c32ab50e0f1e670fb72998b2929009e5580649d1 (patch) | |
| tree | 621cca01224064a71e88d4fad770c6fa3ba69c02 /pkgs/top-level | |
| parent | 9d22624eb06488c6e85755a7b4af3f29f3165238 (diff) | |
| parent | 2b1fa9da8b1896bbc877d110b459c3fb2c8fd2cd (diff) | |
| download | nixpkgs-c32ab50e0f1e670fb72998b2929009e5580649d1.tar nixpkgs-c32ab50e0f1e670fb72998b2929009e5580649d1.tar.gz nixpkgs-c32ab50e0f1e670fb72998b2929009e5580649d1.tar.bz2 nixpkgs-c32ab50e0f1e670fb72998b2929009e5580649d1.tar.lz nixpkgs-c32ab50e0f1e670fb72998b2929009e5580649d1.tar.xz nixpkgs-c32ab50e0f1e670fb72998b2929009e5580649d1.tar.zst nixpkgs-c32ab50e0f1e670fb72998b2929009e5580649d1.zip | |
Merge branch 'cpu-cgroup-v2'
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36a2c629042..f5c5b3f73ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11170,6 +11170,7 @@ in linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.cpu-cgroup-v2."4.4" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11181,6 +11182,7 @@ in linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.cpu-cgroup-v2."4.6" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11192,6 +11194,9 @@ in linux_4_7 = callPackage ../os-specific/linux/kernel/linux-4.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.7" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu |