search

vlang / vinix

Vinix is an effort to write a modern, fast, and useful operating system in the V programming language
https://vlang.io
GNU General Public License v2.0
1.9k stars 120 forks source link

nvme and msix #34

Closed ethan4984 closed 2 years ago

medvednikov commented 2 years ago

Conflicting files kernel/modules/pci/device.v kernel/modules/pci/scan.v

ethan4984 commented 2 years ago

sorry, my git skills are disgusting, I made a lot of mistakes regarding how I handled git with this PR, I didnt rebase my fork, causing that commits that were already merged within another PR I sent also got sent here, causing the merge conflict I think. I just hard reset my fork, I will send a new PR with everything fixed