vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove P6-e1000d-msi-migration from base patches (conflict)

Browse Source 
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.
This commit is contained in:
Vasilito
2026-05-04 19:06:08 +01:00
parent ea380b7daf
commit fd27fe3396
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/core/base/recipe.toml
+2 -1
View File
@@ -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