Thanks to visit codestin.com
Credit goes to github.com

Skip to content

rpi4b: bump legacy, current and edge to new major version #9097

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
Merged
EvilOlaf merged 1 commit into from
Dec 19, 2025
Merged

rpi4b: bump legacy, current and edge to new major version #9097

EvilOlaf merged 1 commit into from
Dec 19, 2025

Conversation

@EvilOlaf
Copy link
Member

@EvilOlaf EvilOlaf commented Dec 17, 2025 •
edited
Loading

Description

  • Abandon 6.6.y as legacy
  • Move current 6.12.y to legacy
  • Move edge 6.18.y to current
  • bump edge to 6.19-rc1
  • drop orphaned patch folders

How Has This Been Tested?

Checklist:

  • 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

Summary by CodeRabbit

  • Updates
    • Updated kernel versions for BCM2711 hardware across multiple branches.
    • Modified USB mass storage device identification strings for USB gadget functionality.
    • Improved CPU info display consistency.
    • Adjusted USB remote wakeup capabilities across kernel versions.

✏️ Tip: You can customize this high-level summary in your review settings.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Dec 17, 2025 •
edited
Loading

Walkthrough

Kernel version updates for bcm2711 across legacy (6.6→6.12), current (6.12→6.18), and edge (6.18→6.19) branches with corresponding patch files for each kernel version, including CPU info consistency, platform selection configuration, USB gadget wakeup functionality, and mass storage product naming customization.

Changes

Cohort / File(s) Change Summary
Kernel Version Configuration
config/sources/families/bcm2711.conf		 Updates KERNEL_MAJOR_MINOR and KERNELBRANCH across legacy, current, and edge branches; legacy: 6.6→6.12, current: 6.12→6.18, edge: 6.18→6.19
bcm2711-6.1 Patches
patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch, patch/kernel/archive/bcm2711-6.1/001-force-platform-selection-brcm-soc-support.patch.disabled, patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch, patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch		 Removes conditional model name printing in cpuinfo; removes BCM platform selection from ARM/ARM64 Kconfig; removes USB gadget wakeup functionality (DWC2 wakeup, HID wakeup_on_write); changes mass storage vendor/product strings from Linux/File-based to PiKVM/Drive-based
bcm2711-6.6 Patches
patch/kernel/archive/bcm2711-6.6/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch, patch/kernel/archive/bcm2711-6.6/001-force-platform-selection-brcm-soc-support.patch.disabled, patch/kernel/archive/bcm2711-6.6/1003-remote-wakeup.patch, patch/kernel/archive/bcm2711-6.6/2001-rename-msd.patch		 Same pattern as bcm2711-6.1: removes conditional cpuinfo printing, removes BCM Kconfig selects, removes USB gadget wakeup (DWC2 and HID implementations), changes mass storage product identification strings
bcm2711-6.10 Patches
patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch, patch/kernel/archive/bcm2711-6.10/001-force-platform-selection-brcm-soc-support.disabled, patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch		 Removes cpuinfo conditional printing and BCM Kconfig platform selection; removes USB gadget wakeup features (includes DWC2 wakeup hook, HID wakeup_on_write option, and related configuration attributes)

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20–25 minutes

  • Repetitive pattern recognition: Same patch modifications applied across three kernel versions (6.1, 6.6, 6.10), which reduces unique reasoning required per file
  • Kernel version alignment verification: Ensure version bumps in bcm2711.conf (6.6→6.12→6.18→6.19) correctly correspond to updated patch directories
  • USB gadget wakeup implementation: Review consistency of wakeup feature removal across DWC2 driver and HID gadget function (complex logic with spinlocks, state management, and multiple code paths in 6.1/6.6/6.10)
  • Potential cross-version inconsistencies: Verify that 6.10 patch file does not include 2001-rename-msd.patch (appears to be missing/removed vs 6.1 and 6.6)

Possibly related PRs

Suggested reviewers

  • PanderMusubi
  • igorpecovnik
  • teknoid

Poem

🐰 Versions hop through branches neat,
Six to twelve, the kernels meet,
Patches dance from old to new,
USB wakes where gadgets flew!
PiKVM's drive takes center stage,
A rabbit's delight in this kernel age! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly describes the main change: bumping kernel versions (legacy, current, edge) to new major versions for rpi4b, which aligns with the primary objective and changes in config/sources/families/bcm2711.conf.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added size/large PR with 250 lines or more 02 Milestone: First quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Dec 17, 2025
igorpecovnik
igorpecovnik approved these changes Dec 17, 2025
View reviewed changes
Copy link
Member

@igorpecovnik igorpecovnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think here we can go straight to 6.18 right away.

@github-actions github-actions bot added the Ready to merge Reviewed, tested and ready for merge label Dec 17, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Dec 17, 2025

✅ This PR has been reviewed and approved — all set for merge!

@github-actions github-actions bot removed the Needs review Seeking for review label Dec 17, 2025
@EvilOlaf EvilOlaf merged commit 95535bb into armbian:main Dec 19, 2025
1 check passed
@EvilOlaf EvilOlaf deleted the rpi4b-maint branch December 19, 2025 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@igorpecovnik igorpecovnik igorpecovnik approved these changes

@PanderMusubi PanderMusubi Awaiting requested review from PanderMusubi PanderMusubi is a code owner

@teknoid teknoid Awaiting requested review from teknoid teknoid is a code owner

Assignees

No one assigned

Labels

02 Milestone: First 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/large PR with 250 lines or more

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@EvilOlaf @igorpecovnik