Skip to content

mainline: bump to 7.0 stable#9661

Merged
EvilOlaf merged 3 commits intoarmbian:mainfrom
EvilOlaf:7.0-stable
Apr 13, 2026
Merged

mainline: bump to 7.0 stable#9661
EvilOlaf merged 3 commits intoarmbian:mainfrom
EvilOlaf:7.0-stable

Conversation

@EvilOlaf
Copy link
Copy Markdown
Member

@EvilOlaf EvilOlaf commented Apr 13, 2026

Description

rollover mainline config to 7.1-rc1 to allow stable builds to be built
remove upstreamed patch from rockchip64
rewrite rockchip64

How Has This Been Tested?

  • test builds for various families - pending
  • meson64 build
  • sunxi build
  • sunxi64 build
  • rockchip64 build
  • rockchip build
  • uefi-arm64
  • uefi-x86

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

  • New Features

    • Enabled DisplayPort Alt Mode support on Pinebook Pro with enhanced USB Type-C connectivity and mode-switching capabilities.
  • Updates

    • Updated mainline kernel configuration to support kernel version 7.1 release candidates.
  • Reverts

    • Reverted MAC address reading optimizations for Motorcomm network controllers.

@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines 05 Milestone: Second quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Apr 13, 2026
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Apr 13, 2026

📝 Walkthrough

Walkthrough

Kernel configuration updated to version 7.1 with corresponding function rename. Device tree patch adds DisplayPort Alt Mode support and USB Role switching for Pinebook Pro. An existing eFUSE MAC address timing fix patch was removed.

Changes

Cohort / File(s) Summary
Kernel Version Configuration
config/sources/mainline-kernel.conf.sh
Updated mainline kernel selection from 7.0 to 7.1: renamed hook function and changed KERNELBRANCH target from tag:v7.0-rc7 to tag:v7.1-rc1, with corresponding conditional logic updates.
Device Tree DisplayPort Support
patch/kernel/archive/rockchip64-7.0/board-pbp-add-dp-alt-mode.patch
Added typec-extcon-bridge node with DisplayPort Alt Mode configuration, enabled USB OTG role switching, extended PDO capabilities with dual-role flags, and bound multiple USB/PHY components to the new extcon bridge.
eFUSE MAC Address Patch Removal
patch/kernel/archive/rockchip64-7.0/net-stmmac-dwmac-motorcomm-fix-eFUSE-MAC-Address-Rea.patch
Deleted 81-line patch that addressed eFUSE controller read failures by removing atomic polling, pre-initialization calls, and timing delays in the Motorcomm driver probe sequence.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Poem

🐰 A kernel leaps from seven-point-oh to seven-point-one,
While DisplayPort dances in Alt Mode fun!
The bridge connects USB to data streams bright,
And eFUSE delays vanish into the night—
BuildRoot hops onward, code ever refined! 🌿

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning The title states 'bump to 7.0 stable' but the PR objectives and change summary indicate the actual changes involve rolling to 7.1-rc1 (release candidate), not 7.0 stable. This is misleading. Update the title to accurately reflect that the changes involve rolling to 7.1-rc1 (e.g., 'mainline: rollover to 7.1-rc1' or similar).
✅ Passed checks (2 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

🧹 Nitpick comments (1)
config/sources/mainline-kernel.conf.sh (1)

31-33: Clarify conflicting alert semantics in the Torvalds fallback hook.

Line 31 states we are using Linus’ repo, but Line 33 reports a “missing torvalds tag,” which reads as the opposite and can confuse incident/debug logs.

Proposed wording tweak
-		display_alert "mainline-kernel: missing torvalds tag on 7.1-rc1" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
+		display_alert "mainline-kernel: forcing torvalds source for 7.1-rc1 (mirror lag workaround)" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@config/sources/mainline-kernel.conf.sh` around lines 31 - 33, The two
display_alert calls in the Torvalds fallback hook conflict (one says "Using
Linus kernel repo for 7.1-rc1" while the other says "missing torvalds tag"), so
update the alert text for consistency: use display_alert and the variables
KERNELSOURCE and KERNELBRANCH to clearly state that we are falling back to the
Torvalds repo because the expected torvalds tag was missing (e.g., "Falling back
to Torvalds repo; using KERNELSOURCE='${KERNELSOURCE}' for
KERNELBRANCH='${KERNELBRANCH}'" or change the first message to mention the
fallback), and ensure both alerts consistently reflect the fallback reason and
resulting KERNELSOURCE/KERNELBRANCH values.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@config/sources/mainline-kernel.conf.sh`:
- Around line 31-33: The two display_alert calls in the Torvalds fallback hook
conflict (one says "Using Linus kernel repo for 7.1-rc1" while the other says
"missing torvalds tag"), so update the alert text for consistency: use
display_alert and the variables KERNELSOURCE and KERNELBRANCH to clearly state
that we are falling back to the Torvalds repo because the expected torvalds tag
was missing (e.g., "Falling back to Torvalds repo; using
KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" or change the
first message to mention the fallback), and ensure both alerts consistently
reflect the fallback reason and resulting KERNELSOURCE/KERNELBRANCH values.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 07566a8d-009e-4d7e-8832-213f2571c8b6

📥 Commits

Reviewing files that changed from the base of the PR and between 6303f64 and cb58526.

📒 Files selected for processing (3)
  • config/sources/mainline-kernel.conf.sh
  • patch/kernel/archive/rockchip64-7.0/board-pbp-add-dp-alt-mode.patch
  • patch/kernel/archive/rockchip64-7.0/net-stmmac-dwmac-motorcomm-fix-eFUSE-MAC-Address-Rea.patch
💤 Files with no reviewable changes (1)
  • patch/kernel/archive/rockchip64-7.0/net-stmmac-dwmac-motorcomm-fix-eFUSE-MAC-Address-Rea.patch

Copy link
Copy Markdown
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.

if it builds, lets go.

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions github-actions bot added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Apr 13, 2026
@EvilOlaf

This comment was marked as resolved.

@coderabbitai

This comment was marked as resolved.

@EvilOlaf EvilOlaf merged commit 43751f1 into armbian:main Apr 13, 2026
13 checks passed
@EvilOlaf EvilOlaf deleted the 7.0-stable branch April 13, 2026 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

05 Milestone: Second 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.

2 participants