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

[backport] Gpio Interrupt fix for the CC2538 #7314

Merged
merged 1 commit into from
Jul 5, 2017

Conversation

AnonMall
Copy link

@AnonMall AnonMall commented Jul 4, 2017

CC2538 gpio interrupt fix, where the interrupt has not been properly acknowledged

@AnonMall AnonMall changed the title gpio interrupt fix CC2538 gpio interrupt fix Jul 4, 2017
@aabadie aabadie modified the milestone: Release 2017.07 Jul 4, 2017
@aabadie
Copy link
Contributor

aabadie commented Jul 4, 2017

Is it the backport from #7303 ? Then I think there's something wrong: the commit is not the same (correct me if I'm wrong).
The right process is to open PR of the same branch PR'ed in #7303 to 2017.07-branch. Then same commit hash ensure the changes are the same.

Second problem: prefix the PR title with [backport] and give the same title.

Please re-open another one.

@aabadie
Copy link
Contributor

aabadie commented Jul 4, 2017

Sorry, looking at #7283, the commit were different there as well. So I'm wondering what is the correct procedure here. Cherry-pick ? Direct PR of initial branch ?

@AnonMall AnonMall changed the title CC2538 gpio interrupt fix [backport] Gpio Interrupt fix for the CC2538 Jul 5, 2017
@smlng
Copy link
Member

smlng commented Jul 5, 2017

@aabadie I think this backport is fine, it matches #7303 though the commit hash is different. Me personally made that mistake when backporting in the past, too.

@AnonMall: either create a new branch based on release-branch and cherry-pick your fix-commit or rebase the original fix-branch onto the release-branch, would do I guess.

Anyhow, I ACK this!

@smlng smlng added Area: drivers Area: Device drivers Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jul 5, 2017
@aabadie
Copy link
Contributor

aabadie commented Jul 5, 2017

Ok, thanks @smlng, then we can merge after Murdock is green.

@aabadie aabadie modified the milestone: Release 2017.07 Jul 5, 2017
@aabadie aabadie added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jul 5, 2017
@miri64
Copy link
Member

miri64 commented Jul 5, 2017

The right process is to open PR of the same branch PR'ed in #7303 to 2017.07-branch. Then same commit hash ensure the changes are the same.

Just to shed some git knowledge: that's impossible. 2017.07-branch and master have now diverged, so rebaseing the commit in #7303 will always result in a different commit hash, since it will have a different parent. Remember: the hash is generated from an objects content, and a commit object consists of the tree's hash it s pointing to, the hash of the parent(s) and commit and author date.

Sorry, looking at #7283, the commit were different there as well. So I'm wondering what is the correct procedure here. Cherry-pick ? Direct PR of initial branch ?

The way it is done here. If you don't trust your eyes make a diff to the respective merge base and get a hash of that (git diff $(git merge-base <base-branch> <PR-branch>) | sha1sum)

@miri64 miri64 merged commit dd19e6c into RIOT-OS:2017.07-branch Jul 5, 2017
@smlng
Copy link
Member

smlng commented Jul 5, 2017

@miri64 thanks for clearing things up - it was my (intuitive) understanding (but wasn't 100% sure) as well that is impossible to have the same commit hash with two different parent-branches.

@miri64
Copy link
Member

miri64 commented Jul 5, 2017

(cherry-picking internally is the same as rebasing btw, just done manually)

@aabadie
Copy link
Contributor

aabadie commented Jul 5, 2017

That was my intuition as well, but I was unsure if I missed something in the RIOT procedure.

@AnonMall AnonMall deleted the gpioIntFixRebase branch January 31, 2018 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: drivers Area: Device drivers CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants