Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix scmode #251

Merged
merged 4 commits into from
May 20, 2024
Merged

Fix scmode #251

merged 4 commits into from
May 20, 2024

Conversation

tariqkurd-repo
Copy link
Collaborator

SCMODE didn't specify how to treat updating the M-bit when X=0
and I've done some associated tidying up to the M-bit section.

@tariqkurd-repo
Copy link
Collaborator Author

tariqkurd-repo commented May 16, 2024

There's something odd going on - the change to attributes.adoc is already on main so isn't a change.
It looks like it hasn't rebased against #250

So please ignore the CRE edits ?! and review the other changes

@arichardson
Copy link
Collaborator

This GitHub behaviour is very strange, could you do a git pull --rebase on your side and then push -f to get it updated?

Copy link
Collaborator

@arichardson arichardson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, but it's probably best to rebase and update the PR before squash-merging since github seems confused about the state of the repository.

@tariqkurd-repo tariqkurd-repo merged commit 95033a8 into riscv:main May 20, 2024
3 checks passed
tariqkurd-repo added a commit to tariqkurd-repo/riscv-cheri that referenced this pull request Jun 3, 2024
SCMODE didn't specify how to treat updating the M-bit when X=0
and I've done some associated tidying up to the M-bit section.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants