summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-02-18 18:33:36 -0500
committerTim Steinbach <tim@nequissimus.com>2017-02-18 18:33:36 -0500
commit2423313581c6429b7cab25aa24c8bad848ad164f (patch)
tree8f3063c2ad50eb9307a10be547c27d859bdc6ece /pkgs/os-specific/linux
parent993d2db029577b580741a58b68694d5b05869e19 (diff)
downloadnixpkgs-2423313581c6429b7cab25aa24c8bad848ad164f.tar
nixpkgs-2423313581c6429b7cab25aa24c8bad848ad164f.tar.gz
nixpkgs-2423313581c6429b7cab25aa24c8bad848ad164f.tar.bz2
nixpkgs-2423313581c6429b7cab25aa24c8bad848ad164f.tar.lz
nixpkgs-2423313581c6429b7cab25aa24c8bad848ad164f.tar.xz
nixpkgs-2423313581c6429b7cab25aa24c8bad848ad164f.tar.zst
nixpkgs-2423313581c6429b7cab25aa24c8bad848ad164f.zip
kernel: 4.9.10 -> 4.9.11
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.9.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix10
2 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 103c8f6c698..09f0fd72eee 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -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;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c94907efc4a..824d685378c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -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";
-      };
-    };
-
 }