boards: removed support for pca1000[0|5] (gnrc_netif2 backport)#8074
Merged
miri64 merged 5 commits intoRIOT-OS:gnrc_netif2_integration/masterfrom Nov 17, 2017
Merged
Conversation
miri64
added
Type: bug
miri64
added
the
CI: ready for build
Member
Author
|
static tests fail because Murdock is doing a rebase instead of a merge so my git history hack does not apply for it. Since we merge this PR anyways instead of rebasing it, I would say: merge anyway. Can I get an 'Aye'? |
Contributor
|
'Ei' |
Member
Author
|
🥚 |
Member
Author
|
Wasn't the sanest idea after all -.-... will revert this |
This was referenced Nov 17, 2017
Member
Author
|
For later reference: this PR was removed without any trace from the git history in #7925 after it was merged. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To solve the merge conflict in #7925, this backports #7979 to #7925. The merge in d683afd has to stay in I'm afraid, so git can keep track of the move of
test/gnrc_netif2totest/gnrc_netif. I'm not happy about this approach, but save from rebasing (which again: would require re-reviewing all changes that were contributed to #7925) this seems to be the sanest approach.