From eecf76eaa23f12109fc2be64a892fcabcf8ae642 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 27 Nov 2016 19:47:34 -0500 Subject: [PATCH] linux: 4.9-rc6 -> 4.9-rc7 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ab5af38d8b6..2ae714ea089 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -367,7 +367,9 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") '' MLX4_EN_VXLAN y ''} - MODVERSIONS y + ${optionalString (versionOlder version "4.9") '' + MODVERSIONS y + ''} MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y NET_FC y # Fibre Channel driver support diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9979b854693..95e89005b0f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc6"; - modDirVersion = "4.9.0-rc6"; + version = "4.9-rc7"; + modDirVersion = "4.9.0-rc7"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0pxf4gzg8qxlf0i83vybf8g22aj0jjbk6n63bh9nciqhbshilr1w"; + sha256 = "0da5bf5cizvbn68d8pb5kyli3zkgsc8g61kn1b4d8gwvfxrb75hx"; }; features.iwlwifi = true;