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