Merge pull request #198783 from aacebedo/linux-testing_6.1_rc3
This commit is contained in:
commit
c3033dafb0
@ -550,7 +550,7 @@ let
|
|||||||
CGROUP_RDMA = whenAtLeast "4.11" yes;
|
CGROUP_RDMA = whenAtLeast "4.11" yes;
|
||||||
|
|
||||||
MEMCG = yes;
|
MEMCG = yes;
|
||||||
MEMCG_SWAP = yes;
|
MEMCG_SWAP = whenOlder "6.1" yes;
|
||||||
|
|
||||||
BLK_DEV_THROTTLING = yes;
|
BLK_DEV_THROTTLING = yes;
|
||||||
CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1
|
CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "6.0-rc5";
|
version = "6.1-rc3";
|
||||||
extraMeta.branch = lib.versions.majorMinor version;
|
extraMeta.branch = lib.versions.majorMinor version;
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will always add .0
|
# modDirVersion needs to be x.y.z, will always add .0
|
||||||
@ -11,7 +11,7 @@ buildLinux (args // rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||||
hash = "sha256-GELU1ZEOM5gGUJxG54JoiI9qLQXJ2Cd/kyOLcp0AWgc=";
|
hash = "sha256-qz863wvIe/JJjqSYoxxbt+2xTqgNNZJpAfWr8nG8wKk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Should the testing kernels ever be built on Hydra?
|
# Should the testing kernels ever be built on Hydra?
|
||||||
|
Loading…
Reference in New Issue
Block a user