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

meson: remove tag defined in KERNELBRANCH for 6.6 mainline kernel #7712

Merged
merged 1 commit into from
Jan 20, 2025

Conversation

amazingfate
Copy link
Contributor

@amazingfate amazingfate commented Jan 17, 2025

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.

@The-going
Copy link
Contributor

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.

The point of this is to adapt the patches to the new kernel version for sunxi-legacy, which is 6.1.125 today.
I don't want to do this today because it will be deleted tomorrow.

The tags for sunxi should be left off.

P.S. I want to limit my participation in the Armbian project to just putting the patches for sunxi
and some system scripts in order.
Configuration, build scripts, endless dependencies on third-party projects are all
the privilege of other maintainers and I do not interfere in this.
Sometimes I just pay attention to the problem, but give others the opportunity to make a decision.

@igorpecovnik igorpecovnik added the Breaking change Can potentially break core functionality label Jan 19, 2025
@amazingfate amazingfate changed the title sunxi/sunxi64/meson: remove tag defined in KERNELBRANCH for 6.1/6.6 m… meson: remove tag defined in KERNELBRANCH for 6.6 mainline kernel Jan 20, 2025
@amazingfate
Copy link
Contributor Author

Now this pr will only change meson family.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 02 Milestone: First quarter release and removed Needs review Seeking for review labels Jan 20, 2025
@igorpecovnik igorpecovnik removed the Breaking change Can potentially break core functionality label Jan 20, 2025
@igorpecovnik igorpecovnik merged commit 67c56e0 into armbian:main Jan 20, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
02 Milestone: First quarter release Hardware Hardware related like kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines
Development

Successfully merging this pull request may close these issues.

3 participants