p22 recommit into p22-final#226
p22 recommit into p22-final#226illuminati2285 wants to merge 4 commits intocodenet:p22-sleeplocksfrom
Conversation
|
I still see very large diffs on |
|
Let me clean this to simplify your life :-) |
|
Ok, I think different new line characters (probably because you are using windows?) are inflating the diffs. You can open your files in vim and do I pulled and cleaned (all of?) your changes into https://github.com/codenet/col331/tree/p22-temp and resolved merge conflicts. You can check that branch and verify if all your changes are covered. (I actually directly copied some relevant parts from xv6-public, so there may be differences. Please check carefully). If you are satisfied, we can raise the PR from p22-temp to p22-sleeplocks. Otherwise, you can clean up diffs in this PR and I will close the p22-temp branch. Please comment here after your diffs are clean. |
|
I cleaned this PR up. The issue was the CRLF line endings (since I am working on WSL I couldn't see them locally ,thanks for pointing that out). The diffs seem to be accurate now, so we can proceed with merging this PR and close the p22-temp branch. Regret the inconvenience caused. |
|
Sir @codenet , I noticed this PR was closed without merging. Could you please let me know the reason? If any changes are needed, I would be happy to update the PR. |
I have created this new branch directly from
col331/p22-sleeplocksand copied over my P22 changes to ensure a clean diff.Link to previous PR for reference: [#215]