From f412e19996f059faaa216fb52babe7efa2d5ff27 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Aug 2018 21:50:19 -0400 Subject: [PATCH] linux: 4.18-rc8 -> 4.19-rc1 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index dd3186bc876..68b5e7c21a8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -302,7 +302,7 @@ let CIFS_XATTR = yes; CIFS_POSIX = yes; CIFS_FSCACHE = yes; - CIFS_STATS = yes; + CIFS_STATS = whenOlder "4.19" yes; CIFS_WEAK_PW_HASH = yes; CIFS_UPCALL = yes; CIFS_ACL = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ec3baaf1e0a..c2feeceb072 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc8"; - modDirVersion = "4.18.0-rc8"; - extraMeta.branch = "4.18"; + version = "4.19-rc1"; + modDirVersion = "4.19.0-rc1"; + extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0rqyqms63c15iwcwy40yqd9fvlvh3ah09gddv0wf45z9dqp7id1m"; + sha256 = "14c9xg9sv0jrdri36das97vdbybi7vmcy59mj9wmgaz81cdk3wg5"; }; # Should the testing kernels ever be built on Hydra?