From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Cc: Jamie McClymont <jamie@kwiius.com>
Subject: [PATCH nixpkgs v2 8/8] spectrumPackages.linux: drop evged patch
Date: Sat, 29 May 2021 14:41:17 +0000 [thread overview]
Message-ID: <20210529144117.571353-9-hi@alyssa.is> (raw)
In-Reply-To: <20210529144117.571353-1-hi@alyssa.is>
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
next prev parent reply other threads:[~2021-05-29 14:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-29 14:41 [PATCH nixpkgs v2 0/8] chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1 Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 1/8] " Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 2/8] chromiumOSPackages.linux: fix config Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 3/8] chromiumOSPackages.common-mk: update patches Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 4/8] chromiumOSPackages.vm_protos: drop GN patch Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 5/8] chromiumOSPackages.common-mk: disable clang-only warnings Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 6/8] chromiumOSPackages.sommelier: update patches Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 7/8] crosvm: fix build Alyssa Ross
2021-05-29 14:41 ` Alyssa Ross [this message]
2021-06-02 12:30 ` [PATCH nixpkgs v2 0/8] chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1 Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210529144117.571353-9-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
--cc=jamie@kwiius.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).