kernel: 4.9.10 -> 4.9.11

This commit is contained in:
Tim Steinbach 2017-02-18 18:33:36 -05:00
parent 993d2db029
commit 2423313581
No known key found for this signature in database
GPG key ID: 472BFCCA96BD0EDA
3 changed files with 2 additions and 13 deletions

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9.10";
version = "4.9.11";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "098mcq3rg05gpammcdfhr2xhcy69ggc9h5g18m4ymnfqdx3havmx";
sha256 = "1czj88bj27yaiikf88kz131ayivcqhkq9d5r863w1s3qj04c2bsi";
};
kernelPatches = args.kernelPatches;

View file

@ -174,14 +174,4 @@ rec {
sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
};
};
sctp_bug_on_CVE_2017_5986 = rec
{ name = "sctp_BUG_ON_CVE_2017_5986.patch";
patch = fetchpatch {
inherit name;
url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2dcab598484185dea7ec22219c76dcdd59e3cb90";
sha256 = "15np10bfm5yzby9zbkrh23qpm91wnprblsk0xn9yjryypnz8njxh";
};
};
}

View file

@ -11312,7 +11312,6 @@ with pkgs;
# !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
# kernelPatches.cpu-cgroup-v2."4.7"
kernelPatches.modinst_arg_list_too_long
kernelPatches.sctp_bug_on_CVE_2017_5986
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu