From 695c2e4ee46c9533f4081fff74c3de157aec9a79 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 27 Mar 2016 03:06:58 +0100 Subject: kernel-config: do not use NFSD_PNFS on >=4.6 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f3dd32386bc..e7e81f4877f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -210,7 +210,7 @@ with stdenv.lib; OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y UBIFS_FS_ADVANCED_COMPR? y - ${optionalString (versionAtLeast version "4.0") '' + ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") '' NFSD_PNFS y ''} NFSD_V2_ACL y -- cgit 1.4.1 From 8b7e150bb94fec38451eda20e644bda928caac9d Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 27 Mar 2016 03:08:24 +0100 Subject: linux-testing: 4.5-rc7 -> 4.6-rc1 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 57a825ec0a0..e58230712a9 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.5-rc7"; - modDirVersion = "4.5.0-rc7"; - extraMeta.branch = "4.5"; + version = "4.6-rc1"; + modDirVersion = "4.6.0-rc1"; + extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0z43s7ccikmqigv4insjvizs3bkx2lgjvzsz5rmmpcga28dz44kq"; + sha256 = "1y73sjd7i48d1c8x52z59imx8g8d00wy67r5666cvwqrq8d407h0"; }; features.iwlwifi = true; -- cgit 1.4.1