Skip to content

p22 recommit into p22-final#226

Closed
illuminati2285 wants to merge 4 commits intocodenet:p22-sleeplocksfrom
illuminati2285:p22-final
Closed

p22 recommit into p22-final#226
illuminati2285 wants to merge 4 commits intocodenet:p22-sleeplocksfrom
illuminati2285:p22-final

Conversation

@illuminati2285
Copy link
Copy Markdown

I have created this new branch directly from col331/p22-sleeplocks and copied over my P22 changes to ensure a clean diff.
Link to previous PR for reference: [#215]

@codenet
Copy link
Copy Markdown
Owner

codenet commented Mar 14, 2026

I still see very large diffs on defs.h, proc.c etc. Is it just me?

@codenet
Copy link
Copy Markdown
Owner

codenet commented Mar 14, 2026

Let me clean this to simplify your life :-)

@codenet
Copy link
Copy Markdown
Owner

codenet commented Mar 14, 2026

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 :set ff=unix and save them.

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.

@illuminati2285
Copy link
Copy Markdown
Author

illuminati2285 commented Mar 14, 2026

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.

@codenet codenet deleted the branch codenet:p22-sleeplocks March 16, 2026 09:02
@codenet codenet closed this Mar 16, 2026
@illuminati2285
Copy link
Copy Markdown
Author

illuminati2285 commented Mar 16, 2026

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants