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

sunxi/sunxi64/meson: remove tag defined in KERNELBRANCH for 6.1/6.6 m… #7712

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

amazingfate
Copy link
Contributor

…ainline kernel

Description

After we enable BTF for all families in #7629, mainline kernel 6.1/6.6 before v6.1.113/v6.6.54 can't load dkms module because of missing patch torvalds/linux@f34d086.
Deleting the line defining a tag to KERNELBRANCH can make us use branch linux-${KERNEL_MAJOR_MINOR}-y in linux-stable repo by default.

I use command git grep KERNELBRANCH|grep tag|grep -E "v6.1\.|v6.6" to find the tree families defining a tag for 6.1/6.6 kernel.

6.1 and 6.6 are lts kernel release long time ago and there should not be much change in the stable branch which can break our patches, and we can always keep the kernel up to date by using the linux-stable branch.

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • I have not tested because I don't have allwinner or amlogic boards.

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@github-actions github-actions bot added size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Jan 17, 2025
@The-going
Copy link
Contributor

6.1 and 6.6 are lts kernel release long time ago and there should not be much change in the stable branch which can break our patches, and we can always keep the kernel up to date by using the linux-stable branch.

The 6.1 kernel is no longer supported by armbian and will be removed very soon.
In the process of further maintenance in the mainline core in version 6.6, some changes from the master branch will be applied. And it will overlap or conflict with our patches. Just trust me.

@amazingfate
Copy link
Contributor Author

6.1 and 6.6 are lts kernel release long time ago and there should not be much change in the stable branch which can break our patches, and we can always keep the kernel up to date by using the linux-stable branch.

The 6.1 kernel is no longer supported by armbian and will be removed very soon. In the process of further maintenance in the mainline core in version 6.6, some changes from the master branch will be applied. And it will overlap or conflict with our patches. Just trust me.

Usually the commits applied to linux-stable are necessary fix, and usually no changes to current kernel API. If that breaks our patch, we should fix ours.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review size/small PR with less then 50 lines
Development

Successfully merging this pull request may close these issues.

2 participants