Unverified Commit fd2ac5b6 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #298948 from alyssais/linux-6.9-rc1 

Linux kernels 2024-03-05
parents 91cdc9f4 c9729a3d

pkgs/os-specific/linux/kernel/common-config.nix

+4 −3
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ let 
      DAMON_VADDR = whenAtLeast "5.15" yes;

      DAMON_PADDR = whenAtLeast "5.16" yes;

      DAMON_SYSFS = whenAtLeast "5.18" yes;

      DAMON_DBGFS = whenAtLeast "5.15" yes;

      DAMON_DBGFS = whenBetween "5.15" "6.9" yes;

      DAMON_RECLAIM = whenAtLeast "5.16" yes;

      DAMON_LRU_SORT = whenAtLeast "6.0" yes;

      # Support recovering from memory failures on systems with ECC and MCA recovery.
@@ -577,7 +577,7 @@ let 
      EXT4_FS_SECURITY  = yes;

      EXT4_ENCRYPTION   = whenOlder "5.1" yes;



      NTFS_FS            = whenAtLeast "5.15" no;

      NTFS_FS            = whenBetween "5.15" "6.9" no;

      NTFS3_LZX_XPRESS   = whenAtLeast "5.15" yes;

      NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes;
@@ -728,7 +728,8 @@ let 
      X86_USER_SHADOW_STACK = whenAtLeast "6.6" yes;



      # Mitigate straight line speculation at the cost of some file size

      SLS = whenAtLeast "5.17" yes;

      SLS = whenBetween "5.17" "6.9" yes;

      MITIGATION_SLS = whenAtLeast "6.9" yes;

    };



    microcode = {

pkgs/os-specific/linux/kernel/kernels-org.json

+2 −2
Original line number Diff line number Diff line 
{

    "testing": {

        "version": "6.8-rc7",

        "hash": "sha256:0q9isgv6lxzrmb4idl0spxv2l7fsk3nn4cdq0vdw9c8lyzrh5yy0"

        "version": "6.9-rc1",

        "hash": "sha256:05hi2vfmsjwl5yhqmy4h5a954090nv48z9gabhvh16xlaqlfh8nz"

    },

    "6.1": {

        "version": "6.1.82",

pkgs/os-specific/linux/kernel/linux-rt-5.10.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, ... } @ args:



let

  version = "5.10.211-rt103"; # updated by ./update-rt.sh

  version = "5.10.213-rt105"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

  kversion = builtins.elemAt (lib.splitString "-" version) 0;

in buildLinux (args // {
@@ -17,14 +17,14 @@ in buildLinux (args // { 


  src = fetchurl {

    url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

    sha256 = "1cir36s369fl6s46x16xnjg0wdlnkipsp2zhz11m9d3z205hly1s";

    sha256 = "105df7w6m5a3fngi6ajqs5qblaq4lbxsgcppllrk7v1r68i31kw4";

  };



  kernelPatches = let rt-patch = {

    name = "rt";

    patch = fetchurl {

      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

      sha256 = "07br63p90gwmijxq8ad7iyi4d3fkm6jwwl2s2k1549bbaldchbk6";

      sha256 = "1q5kz3mfvwb4fd5i2mbklsa6gifb8g3wbq0wi2478q097dvmb6gi";

    };

  }; in [ rt-patch ] ++ kernelPatches;

pkgs/os-specific/linux/kernel/linux-rt-6.1.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, ... } @ args:



let

  version = "6.1.80-rt26"; # updated by ./update-rt.sh

  version = "6.1.82-rt27"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

  kversion = builtins.elemAt (lib.splitString "-" version) 0;

in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // { 


  src = fetchurl {

    url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";

    sha256 = "0wdnyy7m9kfkl98id0gm6jzp4aa0hfy6gfkb4k4cg1wbpfpcm3jn";

    sha256 = "01pcrcjp5mifjjmfz7j1jb8nhq8nkxspavxmv1l7d1qnskcx4l6i";

  };



  kernelPatches = let rt-patch = {

    name = "rt";

    patch = fetchurl {

      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

      sha256 = "0w47ii5xhsbnkmgzlgg18ljwdms88scbzhqlw0qv3lnldicykg0p";

      sha256 = "03mj6p9z5c2hzdl46479gb9x41papq91g86yyc61fv8hj8kxgysc";

    };

  }; in [ rt-patch ] ++ kernelPatches;

pkgs/os-specific/linux/kernel/linux-rt-6.6.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, ... } @ args:



let

  version = "6.6.21-rt26"; # updated by ./update-rt.sh

  version = "6.6.22-rt27"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

  kversion = builtins.elemAt (lib.splitString "-" version) 0;

in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // { 


  src = fetchurl {

    url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";

    sha256 = "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf";

    sha256 = "1x52c6ywmspp3naishzsknhy7i0b7mv9baxx25a0y987cjsygqr3";

  };



  kernelPatches = let rt-patch = {

    name = "rt";

    patch = fetchurl {

      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

      sha256 = "1sh2jkm3h52a5dkc72xgrw1kz1faw1kzhpbqg64gsxbivmxfvf21";

      sha256 = "01n9khj51xf8dj2hhxhlkha4f8hwf6w5marc227ljm9w5hlza12g";

    };

  }; in [ rt-patch ] ++ kernelPatches;