diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-08-26 21:50:19 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-08-26 21:50:51 -0400 |
| commit | f412e19996f059faaa216fb52babe7efa2d5ff27 (patch) | |
| tree | 8a4844ed1291dbe6e4cbd2f6729c5e918aa65053 | |
| parent | c2c13157bb4339069874206fa9588e75d106c808 (diff) | |
| download | nixlib-f412e19996f059faaa216fb52babe7efa2d5ff27.tar nixlib-f412e19996f059faaa216fb52babe7efa2d5ff27.tar.gz nixlib-f412e19996f059faaa216fb52babe7efa2d5ff27.tar.bz2 nixlib-f412e19996f059faaa216fb52babe7efa2d5ff27.tar.lz nixlib-f412e19996f059faaa216fb52babe7efa2d5ff27.tar.xz nixlib-f412e19996f059faaa216fb52babe7efa2d5ff27.tar.zst nixlib-f412e19996f059faaa216fb52babe7efa2d5ff27.zip | |
linux: 4.18-rc8 -> 4.19-rc1
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | 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 dd3186bc8760..68b5e7c21a8d 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 ec3baaf1e0a4..c2feeceb0729 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? |