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

Follow 6.6-2.0.x-imx instead of 6.6-1.0.x-imx #1946

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

linkjumper
Copy link
Contributor

To be honest, I don't know the exact differences between 6.6-1.0.x-imx and 6.6-2.0.x-imx. We need driver extensions like this, which is only available in 6.6-2.0.x-imx.

Note:

  • 6.6-1.0.x-imx points to 6.6.28
  • 6.6-2.0.x-imx points to 6.6.23

After the merge we should upgrade the (6.6-2.0.x-imx) kernel to 6.6.51 anyway. Any concerns?

@angolini
Copy link
Member

I don't see why not!
I'm working on bumping the kernel already Freescale/linux-fslc#681 Freescale/linux-fslc#680

if you have more bumps ready, please let us know

@otavio otavio merged commit 1998fb2 into Freescale:scarthgap Sep 17, 2024
Copy link

Backport failed for scarthgap, because it was unable to create/access the git worktree directory.

Please cherry-pick the changes locally.

git fetch origin scarthgap
git worktree add -d .worktree/backport-1946-to-scarthgap origin/scarthgap
cd .worktree/backport-1946-to-scarthgap
git checkout -b backport-1946-to-scarthgap
ancref=$(git merge-base dd9125d436c574ddde18bbc4129eeda43dd20c2a cb2c4d72298ecb7031f065df558381f797017f9f)
git cherry-pick -x $ancref..cb2c4d72298ecb7031f065df558381f797017f9f

@otavio
Copy link
Member

otavio commented Sep 17, 2024

@linkjumper I missed that you sent the pull request directly to the branch, instead of sending it first to master. Could you prepare a pull request to master with the same change?

@linkjumper
Copy link
Contributor Author

linkjumper commented Sep 18, 2024

@linkjumper I missed that you sent the pull request directly to the branch, instead of sending it first to master. Could you prepare a pull request to master with the same change?

#1948

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants