From fd27fe3396ec836c44d2bc81a66e191fd4a01bbf Mon Sep 17 00:00:00 2001 From: Vasilito Date: Mon, 4 May 2026 19:06:08 +0100 Subject: [PATCH] fix: remove P6-e1000d-msi-migration from base patches (conflict) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P6-e1000d-msi-migration.patch conflicts with P6-driver-main-fixes.patch — both modify e1000d/src/main.rs at overlapping lines. The MSI migration must be merged into P6-driver-main-fixes during the upcoming P6 rebase. P6-e1000d-msi-migration.patch preserved in local/patches/base/ for reference. --- recipes/core/base/recipe.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index 1bd5fd21..5610ce68 100644 --- a/recipes/core/base/recipe.toml +++ b/recipes/core/base/recipe.toml @@ -5,7 +5,8 @@ patches = [ "P0-daemon-fix-init-notify-unwrap.patch", "P0-workspace-add-bootstrap.patch", "P0-init-continuous-scheduling.patch", - "P6-e1000d-msi-migration.patch", +# TODO: P6-e1000d-msi-migration.patch conflicts with P6-driver-main-fixes +# (both touch e1000d/src/main.rs). Merge into P6-driver-main-fixes on rebase. # TODO: P1 patches (11) exist in local/patches/base/ but need rebase # after redox.patch removal. ACPI (5), PCI/IRQ (3), xHCI (3) — 1144 lines. # P1-acpid-acpi-core.patch