Skip to content

Conversation

@weety
Copy link
Member

@weety weety commented Mar 18, 2013

Remain the old handler to keep forward compatibility

@rogerz
Copy link
Member

rogerz commented Mar 18, 2013

It seems some commits are repeated. And several BSPs fail to build.

@weety
Copy link
Member Author

weety commented Mar 18, 2013

Git rebase operation caused the duplicate commits.

@grissiom
Copy link
Member

No. That means you have used rebase in a wrong way... I will check how to fix the mess asap.

@grissiom
Copy link
Member

As your master is totally broken, I recommend that checkout a clean branch and cherry-pick what you needs. Please do the following(asume upstream is pointed to rt-thread/master):

git checkout upstream/master -b new-isr-interface
git cherry-pick 9f454d867d006581169d9a5959e7083419c5ae57 88cc6b25b868f95e0132f53a688806b4a63238f9 9f999a2dbbc8d0dcc5835ba98facd9e366d9f7f6 c017386a9fd1fe37eb806ebf018838f8463114a0

and push the new branch to your repo and request a new pull.

The result is in https://github.com/grissiom/rt-thread/tree/new-isr-interface and it seems to be OK.

When the pull request is done, please do

git checkout new-isr-interface
git branch -D master
git checkout -b master upstream/master

to reset the master branch.

BTW, it seems that the commit "fixed PHY link status error for AT91SAM9260" has nothing to do with interrupt interface. It's better to commit it in an other branch and request an other pull.

@weety
Copy link
Member Author

weety commented Mar 19, 2013

I have made a new branch according grissiom's method.

@weety weety closed this Mar 19, 2013
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.

3 participants