From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id E8BCC197AC; Sat, 29 May 2021 14:43:49 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 3200B19603; Sat, 29 May 2021 14:42:01 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 0A6911943C; Sat, 29 May 2021 14:41:54 +0000 (UTC) Received: from wforward1-smtp.messagingengine.com (wforward1-smtp.messagingengine.com [64.147.123.30]) by atuin.qyliss.net (Postfix) with ESMTPS id 29EC7194A3 for ; Sat, 29 May 2021 14:41:44 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailforward.west.internal (Postfix) with ESMTP id CB4D911F6; Sat, 29 May 2021 10:41:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 29 May 2021 10:41:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=LkjKscTy0ueLihOOIykmPOX034JR1s8gm+iUEcJAJLA=; b=BTEF/6nx BYG0lEwIZ/xBAOXeThcXgtqCCPeR8Mx1Ggay+yRR7+pJvLvxQJAsgtpt7SNehu8P 4U0mrDwCofJlRhresE4OTIvVf0B83i3HMq8tWwZVvPVOgEt01poEe+go13BWdR8v A9Gtwf0zpwLXS7+ZlbuTlRS71X/JLZHE+yyQvMzMKeIdNm6Tewtkc0NuNIoADnym MYlIysK68iDq3A5EpI1w4jgzCHFm+FUcWqHLzCBNDAvMeRz2yccbML5NKXS4ygiu SQeBkRhVYFWarf586+mApUbDDGMuviUG5ml34JOOpWqV8NbKNROGjf0NEcphcchN ndRbmczbG4R06w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdekledgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhs rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpefgie fggedvfefftdefgeduvdetfeefvdffvdfgteektedtieehteeiueffhfdvleenucffohhm rghinhepghhithhhuhgsrdgtohhmpdhkvghrnhgvlhdrohhrghenucfkphepgeeirdektd drudefkedrjeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p2e508a49.dip0.t-ipconnect.de [46.80.138.73]) by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 May 2021 10:41:42 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 8D51318BD; Sat, 29 May 2021 14:41:39 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs v2 8/8] spectrumPackages.linux: drop evged patch Date: Sat, 29 May 2021 14:41:17 +0000 Message-Id: <20210529144117.571353-9-hi@alyssa.is> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210529144117.571353-1-hi@alyssa.is> References: <20210529144117.571353-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: FKAXQ5OJQ5VNI3KGJZ3PR2NVVMHIHWDF X-Message-ID-Hash: FKAXQ5OJQ5VNI3KGJZ3PR2NVVMHIHWDF X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Jamie McClymont X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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