about summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-06-29 08:26:25 -0400
committerTim Steinbach <tim@nequissimus.com>2017-06-29 08:26:25 -0400
commitd1aff8d2e5610d1026a5a2f0e6ff8653a4123efe (patch)
tree32445eab00994aca8a86b644a34a69c5e938438f /pkgs/os-specific/linux
parent6b35f22e281a1218f9add3fc40940356042b1662 (diff)
linux: 4.9.34 -> 4.9.35
Also, remove XSA-216 patches, the fixes are now integrated upstream
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.nix17
2 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index a45ba31c0a936..f1bdb3c2cb993 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.34";
+  version = "4.9.35";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ij55aqdhqf92a79n9xqw0p32bsksw4zxpn2zhcylhgsn78mkl8k";
+    sha256 = "0dklbr686ygvpbjs6chra9vycfvp8xjgkvapai14lglzsx72749l";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cbba50710b513..1747d34fe112a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -156,21 +156,4 @@ rec {
         sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
       };
     };
-
-  # https://xenbits.xen.org/xsa/advisory-216.html
-  xen_XSA_216 =
-    { name = "xen_XSA-216";
-      patch = fetchpatch {
-        url = "https://xenbits.xen.org/xsa/xsa216-linux-4.11.patch";
-        sha256 = "14h017n6qwnraw5bv72q9xkg2w7xvx290505kny5zfwx891xahs8";
-      };
-    };
-
-  xen_XSA_216_4-4 =
-    { name = "xen_XSA-216-4.4";
-      patch = fetchpatch {
-        url = "https://xenbits.xen.org/xsa/xsa216-linux-4.4.patch";
-        sha256 = "1lv50wpr4lr49i4vp04vl778wcs9xn1jm51hp91h87jr0g3pbvi2";
-      };
-    };
 }