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

James ball clic issue 409 #419

Closed
wants to merge 9 commits into from

Conversation

james-ball-qualcomm
Copy link
Collaborator

Note that I created a new branch off main called "issue 409" but somehow managed to make the changes in my old "issue 411" branch that already got merged into main. Sorry, still getting up to speed on GitHub. I don't think I've done any harm but let me know if otherwise.

Anyways, preparing to renaming 'x' CSRs to 'm' in smclic (i.e., issue 409). Before doing this, noticed that newer CSRs such as indirect CSRs and the cliccfg ext don't have formating of CSR names consistent with rest of CLIC. So, I'm doing this first PR so you can see those changes and then I'll make the issue 409 changes and push them. Then hopefully one PR review and approval can be used to push all this into main.

… have formating of CSR names consistent with rest of CLIC spec so fixing them.
@christian-herber-nxp
Copy link
Collaborator

You can see that you old commits are part of the history in this PR.
I think it would be best to switch to the new branch. You can e.g. git cherry-pick the commit you want to keep.

@christian-herber-nxp
Copy link
Collaborator

Changes look fine.

@james-ball-qualcomm
Copy link
Collaborator Author

This should be ready to merge into the main branch. I'd recommend we do this soon so we can make follow-on changes identified in the new issues I created today.

@christian-herber-nxp
Copy link
Collaborator

This should be ready to merge into the main branch. I'd recommend we do this soon so we can make follow-on changes identified in the new issues I created today.

The commit history in this is still a bis messy. I would suggest to clean this using your favorite git method.

@james-ball-qualcomm
Copy link
Collaborator Author

I have no idea how to clean this up in Git (i.e., don't have a favorite method). Is there someone who can help with this? Otherwise, I'm not sure how I'll make progress on this.

@christian-herber-nxp
Copy link
Collaborator

I am back in office Friday. Might look into it Thursday.
If you want to merge before, just make sure to squash and make a nice commit message for the merge commit. Then at least what ends up in master will be clean.

@james-ball-qualcomm
Copy link
Collaborator Author

Thanks for your offer of assistance.

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