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 6.11: Switch kernel version to v6.11.2, Re-extract patches #7352

Merged
merged 4 commits into from
Oct 9, 2024

Conversation

The-going
Copy link
Contributor

@The-going The-going commented Oct 8, 2024

Description

Re-extract the megous patches
Re-extract armbian patches
Switch kernel version to v6.11.2
BananaPi BPI-M4-Zero: partial DTS re-write

How Has This Been Tested?

  • Test build sunxi64
  • Test B

@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Oct 8, 2024
@The-going
Copy link
Contributor Author

@pyavitz I have removed part of the inapplicable overlay patch.
I found some differences in the DTS between the kernel in your repository and here.
6.11/001-Add-board-BananaPi-BPI-M4-ZERO.patch

I'll take a closer look tomorrow.

@pyavitz
Copy link
Collaborator

pyavitz commented Oct 8, 2024

@pyavitz I have removed part of the inapplicable overlay patch. I found some differences in the DTS between the kernel in your repository and here. 6.11/001-Add-board-BananaPi-BPI-M4-ZERO.patch

I'll take a closer look tomorrow.

My own repo has the DTS rewrite which is why it's different. If you want, just keep it as is and after this gets merged I'll submit a new PR.

@The-going
Copy link
Contributor Author

My own repo has the DTS rewrite which is why it's different. If you want, just keep it as is and after this gets merged I'll submit a new PR.

In fact, I want you and me to spend as little time as possible maintaining patches.
If the option in your repository is newer and works correctly, then I can just make a replacement.
In this case, do I need to add this line directly to the overlay, since I deleted this part of the patch?
status = "disabled"

Or you can do it yourself directly in my branch. I sent you an invite.

please inform us about your decision. I'll be waiting.

If you are wondering why and in what way I work with so many patches,
you can create a personal conversation on the forum. I am available for this.

With respect

@pyavitz
Copy link
Collaborator

pyavitz commented Oct 9, 2024

My own repo has the DTS rewrite which is why it's different. If you want, just keep it as is and after this gets merged I'll submit a new PR.

In fact, I want you and me to spend as little time as possible maintaining patches. If the option in your repository is newer and works correctly, then I can just make a replacement. In this case, do I need to add this line directly to the overlay, since I deleted this part of the patch? status = "disabled"

Or you can do it yourself directly in my branch. I sent you an invite.

please inform us about your decision. I'll be waiting.

If you are wondering why and in what way I work with so many patches, you can create a personal conversation on the forum. I am available for this.

With respect

Done.

@The-going
Copy link
Contributor Author

Patches are applied without errors.
The build of the kernel package is successful.

The kernel with the patches already applied is here:
sunxi-6.11-rebase

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 11 Milestone: Fourth quarter release labels Oct 9, 2024
@igorpecovnik igorpecovnik merged commit 70daac7 into armbian:main Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
11 Milestone: Fourth quarter release Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/medium PR with more then 50 and less then 250 lines
Development

Successfully merging this pull request may close these issues.

3 participants