[WiP] 6.18-rcX bump collab (uefi-*/rockchip64/meson64/wifi/etc) by rpardini · Pull Request #8753 · armbian/build

rpardini · 2025-10-13T10:06:45Z

[WiP] 6.18-rcX bump collab (uefi-*/rockchip64/meson64/wifi/etc)

uefi: bump edge to 6.18
uefi-arm64-6.18: bump 6.17 -> 6.18 via rename
uefi-arm64-6.18: rewrite patches
uefi-arm64-6.18: drop broken patch net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch
stmmac_platform.c:885:15: error: 'struct plat_stmmacenet_data' has no member named 'mac_interface'; did you mean 'phy_interface'?
rockchip64-6.18: bump 6.17 -> 6.18 via rename
rockchip64_common: bump edge to 6.18
rockchip64-6.18: drop 1st round of broken patches
rockchip64-6.18: rewrite vs torvalds pre-6.18-rc1 master
rockchip64-6.18: .config: CONFIG_DRM_ACCEL_ROCKET=m
rockchip64-6.18: drop 2nd round: rk33xx DT's (spdif et al)
rockchip64-6.18: drop 3rd round
rockchip64-6.18: drop 4th round
meson64-6.18: bump 6.17 -> 6.18 via rename
meson64: bump edge 6.17 -> 6.18
meson64-6.18: rewrite patches
drivers_network: disable rtl8852bs (rockchip64-6.18)
drivers_network: disable rtl8723DS (rockchip64-6.18)
drivers_network: disable rtl88x2cs (meson64-6.18)

…-ethernet-drivers-and-ACPI-glue-for-6.x.patch `stmmac_platform.c:885:15: error: 'struct plat_stmmacenet_data' has no member named 'mac_interface'; did you mean 'phy_interface'?`

coderabbitai · 2025-10-13T10:07:34Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches

🧪 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.}

rpardini · 2025-10-13T10:08:10Z

(moving over from #8749)

I started early on 6.18 as that's very likely to be the next LTS.
Here's what I found, a few hours before 6.18-rc1 was released.

I mention who I (possibly wrongly) think is the "owner" here, please point out if not:

uefi:
- uefi-arm64: patch needs rework, should be simple:
  - net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch @rpardini
- uefi-loong64: not handled here; at least one patch doesn't apply @amazingfate ?
rockchip64:
- general-driver-tm16xx-led-driver.patch [in-flux?] @paolosabatino ?
- media-0001-Add-rkvdec-Support-v5.patch [upstreamed?] @amazingfate ?
- rk3308-fix-uart-dma.patch - ?
- rk3399-fix-pci-phy.patch - ?
- rk33xx @paolosabatino ?
  - board-rk3328-roc-pc.patch
  - rk3328-dtsi-mali-opp-table.patch
  - rk3328-dtsi-spdif.patch
  - rk3328-gpu-cooling-target.patch
  - rk3328-roc-cc-add-missing-nodes.patch
  - dt's: (mostly due to spdif patch)
    - rk3318-box.dts
    - rk3328-dusun-dsom-010r.dts
    - rk3328-mksklipad50.dts
    - rk3328-mkspi.dts
    - rk3328-inno-usb3phy-driver.patch
drivers_network: disable rtl8852bs (rockchip64-6.18) - feels simple
drivers_network: disable rtl8723DS (rockchip64-6.18) - feels simple
drivers_network: disable rtl88x2cs (meson64-6.18) @adeepn - feels simple

paolosabatino · 2025-10-13T10:55:34Z

I'll take a look. Just wondering, is it good to bump three families at once in a single PR? I mean, blockages on a family will keep other families on hold as well.

rpardini · 2025-10-13T11:24:07Z

Just wondering, is it good to bump three families at once in a single PR? I mean, blockages on a family will keep other families on hold as well.

I think so, too -- the only thing being cross-family here are the wifi-drivers (which also can be updated independently / in separate PRs / not depending on actual 6.18 bump).

This being WiP/Draft just symbolizes the work needed/pending -- this PR itself should be abandoned eventually -- I'd still send PRs for each family for the actual bump.

amazingfate · 2025-10-13T11:32:51Z

patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-pc.patch

I have fixed this patch. Upstream just deleted gpu node, fix is small.

amazingfate · 2025-10-13T11:33:09Z

patch/kernel/archive/rockchip64-6.18/general-driver-tm16xx-led-driver.patch

I also fixed this patch.

amazingfate · 2025-10-13T11:33:28Z

patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch

This patch can also get fixed.

amazingfate · 2025-10-13T11:34:23Z

patch/kernel/archive/rockchip64-6.18/dt/rk3318-box.dts

This can get fixed.

amazingfate · 2025-10-13T11:34:50Z

patch/kernel/archive/rockchip64-6.18/dt/rk3328-dusun-dsom-010r.dts

Same as rk3318-box, can get fixed.

amazingfate · 2025-10-13T11:35:47Z

patch/kernel/archive/rockchip64-6.18/dt/rk3328-mksklipad50.dts

This file should be fine, it is built without error.

amazingfate · 2025-10-13T11:36:12Z

patch/kernel/archive/rockchip64-6.18/dt/rk3328-mkspi.dts

I have also built this dtb without error.

amazingfate · 2025-10-13T11:37:18Z

patch/kernel/archive/rockchip64-6.18/rk3308-fix-uart-dma.patch

This patch can get fixed according to upstream api change.

amazingfate · 2025-10-13T11:37:25Z

patch/kernel/archive/rockchip64-6.18/rk3399-fix-pci-phy.patch

This patch can get fixed according to upstream api change.

amazingfate · 2025-10-13T14:58:13Z

Here is my rewrite:

loong64: 8e476c0
rockchip64: 55ec55b

amazingfate · 2025-10-14T05:10:23Z

Fix for rtl8852bs and rtl8723ds:
armbian/wifi-rtl8852bs#4
armbian/rtl8723ds#4

rpardini · 2025-10-18T09:02:16Z

Thanks all for all the contributions. I'll integrate everything and send separate PR's for each family.

rpardini · 2025-10-18T09:02:29Z

Starting with meson64 which had zero patch conflicts, and as @adeepn already landed update rtl88x2cs external driver for kernel 6.18+ #8756 --> meson64: bump edge 6.17 -> 6.18 #8777

rpardini · 2025-10-18T10:24:40Z

rockchip64, 100% done by amazingfate --> rockchip64_common: bump edge to 6.18 #8778

rpardini · 2025-10-18T11:18:35Z

uefi:
- loong64 done by amazingfate - thanks!
- x86 is empty
- riscv64 is empty
- arm64: I fixed the Phytium network acpi glue
sent uefi: bump edge to 6.18 #8780

rpardini · 2025-10-18T11:38:06Z

All PR's sent. The 2 wifi fixes were sent in rockchip64 PR, as that's where I identified them breaking. Might be uefi also needs them; such is life.

rpardini · 2025-10-18T11:38:22Z

Thanks everyone! Cya at the individual PRs.

rpardini added 18 commits October 13, 2025 12:06

uefi: bump edge to 6.18

6da2a45

uefi-arm64-6.18: bump 6.17 -> 6.18 via rename

ce2d837

uefi-arm64-6.18: rewrite patches

e6276a0

uefi-arm64-6.18: drop broken patch net-stmicro-stmmac-Phytium-onboard…

fd4322e

…-ethernet-drivers-and-ACPI-glue-for-6.x.patch `stmmac_platform.c:885:15: error: 'struct plat_stmmacenet_data' has no member named 'mac_interface'; did you mean 'phy_interface'?`

rockchip64-6.18: bump 6.17 -> 6.18 via rename

70964fb

rockchip64_common: bump edge to 6.18

d34f1a8

rockchip64-6.18: drop 1st round of broken patches

5306e2d

rockchip64-6.18: rewrite vs torvalds pre-6.18-rc1 master

3438976

rockchip64-6.18: .config: CONFIG_DRM_ACCEL_ROCKET=m

63543ce

rockchip64-6.18: drop 2nd round: rk33xx DT's (spdif et al)

76a6715

rockchip64-6.18: drop 3rd round

97f2116

rockchip64-6.18: drop 4th round

300c53f

meson64-6.18: bump 6.17 -> 6.18 via rename

2697273

meson64: bump edge 6.17 -> 6.18

2664b53

meson64-6.18: rewrite patches

1b27153

drivers_network: disable rtl8852bs (rockchip64-6.18)

1639e79

drivers_network: disable rtl8723DS (rockchip64-6.18)

1882012

drivers_network: disable rtl88x2cs (meson64-6.18)

71c5b6d

github-actions bot added 11 Milestone: Fourth quarter release size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Framework Framework components Patches Patches related to kernel, U-Boot, ... labels Oct 13, 2025

rpardini mentioned this pull request Oct 13, 2025

[Task]: 6.18 (rockchip64 / meson64 / uefi-* ) #8749

Closed

amazingfate reviewed Oct 13, 2025

View reviewed changes

adeepn mentioned this pull request Oct 13, 2025

update rtl88x2cs external driver for kernel 6.18+ #8756

Merged

rpardini closed this Oct 18, 2025

Uh oh!

Conversation

rpardini commented Oct 13, 2025

[WiP] 6.18-rcX bump collab (uefi-*/rockchip64/meson64/wifi/etc)

Uh oh!

coderabbitai bot commented Oct 13, 2025

Review skipped

Uh oh!

rpardini commented Oct 13, 2025

Uh oh!

paolosabatino commented Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rpardini commented Oct 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amazingfate commented Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amazingfate commented Oct 14, 2025

Uh oh!

rpardini commented Oct 18, 2025

Uh oh!

rpardini commented Oct 18, 2025

Uh oh!

rpardini commented Oct 18, 2025

Uh oh!

rpardini commented Oct 18, 2025

Uh oh!

rpardini commented Oct 18, 2025

Uh oh!

rpardini commented Oct 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

paolosabatino commented Oct 13, 2025 •

edited

Loading

amazingfate commented Oct 13, 2025 •

edited

Loading