[PATCH nixpkgs v2 8/8] spectrumPackages.linux: drop evged patch

Alyssa Ross
2021-05-29T14:43:49Z

This has reached the Chromium OS kernel now, so we don't need to apply
it ourselves any more.
---
pkgs/os-specific/linux/kernel/patches.nix | 9 ---------
pkgs/os-specific/linux/spectrum/linux/vm.nix | 3 ---
2 files changed, 12 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index a802a0a24d7..8ce1ac2b587 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -92,13 +92,4 @@
name = "mac_nvme_t2";
patch = ./mac-nvme-t2.patch;
};
-
- # https://github.com/cloud-hypervisor/cloud-hypervisor/blob/8b7aafad16ee8a23d7178a7f7aa6d2c1ec509b5d/docs/hotplug.md#kernel-support
- evged = {
- name = "evged";
- patch = fetchpatch {
- url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch?id=ac36d37e943635fc072e9d4f47e40a48fbcdb3f0";
- sha256 = "0hzl3s2fmsvz54hq478lqi14dwry8a5g2b2awsssxf0r2ga15jk5";
- };
- };
}
diff --git a/pkgs/os-specific/linux/spectrum/linux/vm.nix b/pkgs/os-specific/linux/spectrum/linux/vm.nix
index d6911cf4a81..c657cb443e8 100644
--- a/pkgs/os-specific/linux/spectrum/linux/vm.nix
+++ b/pkgs/os-specific/linux/spectrum/linux/vm.nix
@@ -3,9 +3,6 @@
with lib.kernel;

linux.override {
- # Fix hotplugging with cloud-hypervisor.
- kernelPatches = linux.kernelPatches ++ [ kernelPatches.evged ];
-
structuredExtraConfig = {
VIRTIO_PCI = yes;
VIRTIO_BLK = yes;
--
2.31.1