diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2019-01-07 07:57:32 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-01-07 07:57:38 -0500 |
| commit | 97aba92bcd689b7f2a2e5ff956e3dc2297bce805 (patch) | |
| tree | b88a994a0b6db7c3ac03d5778778ffefd01865a0 /pkgs/os-specific/linux | |
| parent | 220aa6713b89203d956eef7156f46c0fa0689bc7 (diff) | |
| download | nixpkgs-97aba92bcd689b7f2a2e5ff956e3dc2297bce805.tar nixpkgs-97aba92bcd689b7f2a2e5ff956e3dc2297bce805.tar.gz nixpkgs-97aba92bcd689b7f2a2e5ff956e3dc2297bce805.tar.bz2 nixpkgs-97aba92bcd689b7f2a2e5ff956e3dc2297bce805.tar.lz nixpkgs-97aba92bcd689b7f2a2e5ff956e3dc2297bce805.tar.xz nixpkgs-97aba92bcd689b7f2a2e5ff956e3dc2297bce805.tar.zst nixpkgs-97aba92bcd689b7f2a2e5ff956e3dc2297bce805.zip | |
linux: 4.20-rc7 -> 5.0-rc1
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c098571bb60..ab4b1cc2fc9 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -88,9 +88,9 @@ let # Include the CFQ I/O scheduler in the kernel, rather than as a # module, so that the initrd gets a good I/O scheduler. scheduler = { - IOSCHED_CFQ = yes; + IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1 BLK_CGROUP = yes; # required by CFQ" - IOSCHED_DEADLINE = yes; + IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1 MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes; BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes; MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes; @@ -365,7 +365,7 @@ let # https://lwn.net/Articles/682582/ # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655 BLK_WBT = yes; - BLK_WBT_SQ = yes; + BLK_WBT_SQ = whenOlder "5.0" yes; # Removed in 5.0-RC1 BLK_WBT_MQ = yes; }; @@ -382,7 +382,7 @@ let DEVPTS_MULTIPLE_INSTANCES = whenOlder "4.7" yes; BLK_DEV_THROTTLING = yes; - CFQ_GROUP_IOSCHED = yes; + CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1 CGROUP_PIDS = whenAtLeast "4.3" yes; }; @@ -466,7 +466,7 @@ let MEDIA_DIGITAL_TV_SUPPORT = yes; MEDIA_CAMERA_SUPPORT = yes; MEDIA_RC_SUPPORT = whenOlder "4.14" yes; - MEDIA_CONTROLLER = yes; + MEDIA_CONTROLLER = yes; MEDIA_PCI_SUPPORT = yes; MEDIA_USB_SUPPORT = yes; MEDIA_ANALOG_TV_SUPPORT = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1e810a12931..6b92d9be177 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, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.20-rc7"; - modDirVersion = "4.20.0-rc7"; - extraMeta.branch = "4.20"; + version = "5.0-rc1"; + modDirVersion = "5.0.0-rc1"; + extraMeta.branch = "5.0"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0qga2x4rz1vphi7j044f4b4la24qyk5sm7lm8q991imq5wm5s2rl"; + sha256 = "01gva1hp2jyf137iy5ryaq93ksiw9ysnczpp914scx6k005y7yzz"; }; # Should the testing kernels ever be built on Hydra? |