diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-06-24 11:20:32 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-06-24 11:20:32 -0400 |
| commit | 3a68f0bb78b2653c3b9fa945864cc690270f260e (patch) | |
| tree | ad2b8c149203ebf64917f800467361a930e7ed5a /pkgs/os-specific | |
| parent | 69153f12e4706898588716d752351d0e887c789a (diff) | |
| download | nixlib-3a68f0bb78b2653c3b9fa945864cc690270f260e.tar nixlib-3a68f0bb78b2653c3b9fa945864cc690270f260e.tar.gz nixlib-3a68f0bb78b2653c3b9fa945864cc690270f260e.tar.bz2 nixlib-3a68f0bb78b2653c3b9fa945864cc690270f260e.tar.lz nixlib-3a68f0bb78b2653c3b9fa945864cc690270f260e.tar.xz nixlib-3a68f0bb78b2653c3b9fa945864cc690270f260e.tar.zst nixlib-3a68f0bb78b2653c3b9fa945864cc690270f260e.zip | |
linux: 4.11.6 -> 4.11.7
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.11.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ec90620fce13..c05760175cdf 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -593,7 +593,10 @@ with stdenv.lib; FW_LOADER_USER_HELPER_FALLBACK? n # Disable various self-test modules that have no use in a production system - ARM_KPROBES_TEST? n + ${optionalString (versionOlder version "4.11") '' + ARM_KPROBES_TEST? n + ''} + ASYNC_RAID6_TEST? n ATOMIC64_SELFTEST? n BACKTRACE_SELF_TEST? n diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix index 92525b115eec..f74b8f62120d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11.6"; + version = "4.11.7"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ccna0hrqcza3jz83gaxlcg5vijl83w5w3g87v93a5x06ky9nlr5"; + sha256 = "1v94lkc4lzb2k9c3y7j6h4zx827abcy7jqm9jlp5n15dlbmj6bsk"; }; kernelPatches = args.kernelPatches; |