Skip to content

Commit d2fca01

Browse files
authored
Merge pull request #331717 from alyssais/linux-6.9-drop
linux_6_8,linux_6_9: remove
2 parents 203ea78 + ba0d495 commit d2fca01

File tree

8 files changed

+9
-2036
lines changed

8 files changed

+9
-2036
lines changed

nixos/tests/kernel-generic.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ let
3131
linux_5_15_hardened
3232
linux_6_1_hardened
3333
linux_6_6_hardened
34-
linux_6_8_hardened
35-
linux_6_9_hardened
3634
linux_rt_5_4
3735
linux_rt_5_10
3836
linux_rt_5_15

pkgs/os-specific/linux/kernel/patches.nix

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -65,38 +65,4 @@
6565
name = "export-rt-sched-migrate";
6666
patch = ./export-rt-sched-migrate.patch;
6767
};
68-
69-
rust_1_75 = {
70-
name = "rust-1.75.patch";
71-
patch = ./rust-1.75.patch;
72-
};
73-
74-
rust_1_76 = {
75-
name = "rust-1.76.patch";
76-
patch = fetchurl {
77-
name = "rust-1.76.patch";
78-
url = "https://lore.kernel.org/rust-for-linux/[email protected]/raw";
79-
hash = "sha256-q3iNBo8t4b1Rn5k5lau2myqOAqdA/9V9A+ok2jGkLdY=";
80-
};
81-
};
82-
83-
rust_1_77-6_8 = {
84-
name = "rust-1.77.patch";
85-
patch = ./rust-1.77-6.8.patch;
86-
};
87-
88-
rust_1_77-6_9 = {
89-
name = "rust-1.77.patch";
90-
patch = ./rust-1.77.patch;
91-
};
92-
93-
rust_1_78 = {
94-
name = "rust-1.78.patch";
95-
patch = fetchpatch {
96-
name = "rust-1.78.patch";
97-
url = "https://lore.kernel.org/rust-for-linux/[email protected]/raw";
98-
excludes = [ "Documentation/process/changes.rst" ]; # Conflicts on 6.8.
99-
hash = "sha256-EZ+Qa9z1AtAv08e72M7BEsCZi9UK572gmW+AR62a8EM=";
100-
};
101-
};
10268
}

0 commit comments

Comments
 (0)