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.

Sign up for GitHub

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

Jump to bottom

Revert "ipq40xx: switch Wave2 firmware to -ct (#2541)" #2799

Merged
merged 1 commit into from
Feb 26, 2023
Merged

Revert "ipq40xx: switch Wave2 firmware to -ct (#2541)" #2799

merged 1 commit into from
Feb 26, 2023

Conversation

AiyionPrime
Copy link
Member

@AiyionPrime AiyionPrime commented Feb 25, 2023 •
edited by rotanid
Loading

This is a temporary measure that is related to #2692.

This reverts commit 15ef885.

@AiyionPrime
Revert "ipq40xx: switch Wave2 firmware to -ct (freifunk-gluon#2541)"
22c47df 
This is a temporary measure that fixes freifunk-gluon#2692.

This reverts commit 15ef885.
@AiyionPrime AiyionPrime added 5. needs: stable backport The changeset need to be backported to supported stable releases 2. status: waiting-on-review Awaiting review from the assignee but also interested parties. 0. type: bugfix This changeset fixes abug backport v2022.1.x Backport this pull request to v2022.1.x labels Feb 26, 2023
@rotanid rotanid added this to the 2022.1.3 milestone Feb 26, 2023
@github-actions github-actions bot added the 3. topic: hardware Topic: Hardware Support label Feb 26, 2023
@neocturne neocturne merged commit 193fe03 into freifunk-gluon:master Feb 26, 2023
@github-actions
Copy link

Backport failed for v2022.1.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin v2022.1.x
git worktree add -d .worktree/backport-2799-to-v2022.1.x origin/v2022.1.x
cd .worktree/backport-2799-to-v2022.1.x
git checkout -b backport-2799-to-v2022.1.x
ancref=$(git merge-base f71e31a21163a73634e4c3864c29233678c81912 22c47df2423e6149c4b37d5f70741adcf3365f5d)
git cherry-pick -x $ancref..22c47df2423e6149c4b37d5f70741adcf3365f5d

@AiyionPrime AiyionPrime deleted the workaround-unicast-ct branch February 26, 2023 13:54
@AiyionPrime
Copy link
Member Author

The backport takes place in #2800 using the instructions above.

@rotanid rotanid removed the 2. status: waiting-on-review Awaiting review from the assignee but also interested parties. label Apr 13, 2023
@herbetom herbetom mentioned this pull request Oct 25, 2023
Merged
25 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rotanid rotanid rotanid approved these changes

@neocturne neocturne Awaiting requested review from neocturne

@lemoer lemoer Awaiting requested review from lemoer

@blocktrron blocktrron Awaiting requested review from blocktrron

Assignees

@lemoer lemoer

Labels
0. type: bugfix This changeset fixes abug 3. topic: hardware Topic: Hardware Support 5. needs: stable backport The changeset need to be backported to supported stable releases backport v2022.1.x Backport this pull request to v2022.1.x
Projects
None yet
Milestone
2022.1.3
Development

Successfully merging this pull request may close these issues.
4 participants
@AiyionPrime @rotanid @neocturne @lemoer