mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1) #8737

rpardini · 2025-10-09T19:18:31Z

when X is released, please update it to X+1-rc1
otherwise we miss on stable updates

- when X is released, please update it to X+1-rc1 - otherwise we miss on stable updates

coderabbitai · 2025-10-09T19:19:33Z

Walkthrough

Updates config/sources/mainline-kernel.conf.sh to advance the upstream release candidate handling from kernel 6.17 to 6.18. Specifically, it changes the condition checking the major/minor version to 6.18 and sets KERNELBRANCH to tag:v6.18-rc1 when not already defined. The early-return behavior if KERNELBRANCH is pre-set and the informational alert remain unchanged. No other files or logic paths are modified.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

bump edge to 6.16.0-rc7 #8406 — Also bumps the upstream RC tag in config/sources/mainline-kernel.conf.sh within the same function.
Linux kernel: bump mainline to latest version #8687 — Adjusts KERNELBRANCH setting logic for kernel 6.17 in the same script/function.
Bump mainline kernels to rc5 and disable 8189es #8650 — Modifies the same function to update the upstream RC tag for a specified kernel version.

Suggested labels

Build

Suggested reviewers

igorpecovnik
pyavitz
amazingfate
brentr
clee
prahal
efectn

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title Check	✅ Passed	The title clearly identifies that mainline-kernel.conf is being modified to allow the 6.17 kernel series to progress beyond the base v6.17 tag and include patch updates like v6.17.1, directly reflecting the change which updates the version condition to the next release candidate. It concisely mentions the file and the core purpose without introducing unrelated details.
Description Check	✅ Passed	The pull request description clearly explains the motivation to bump the version condition to the next release candidate in order to capture stable updates, which directly relates to the change in mainline-kernel.conf and is not off-topic.
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✨ Finishing touches

📝 Generate docstrings

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 8325404 and e3cf0a4.

📒 Files selected for processing (1)

config/sources/mainline-kernel.conf.sh (1 hunks)

🧰 Additional context used

🧠 Learnings (3)

📓 Common learnings

Learnt from: EvilOlaf
PR: armbian/build#0
File: :0-0
Timestamp: 2025-07-21T04:12:02.439Z
Learning: In the Armbian build system, for recurring maintenance tasks like kernel version bumping, TODO comments should use generic version formats (e.g., "MAJOR.MINOR-rc1") rather than specific version numbers (e.g., "6.17-rc1") to avoid the need for frequent comment updates that would create unnecessary maintenance overhead.

📚 Learning: 2025-04-30T16:16:47.150Z

Learnt from: The-going
PR: armbian/build#8147
File: config/sources/families/include/sunxi64_common.inc:38-39
Timestamp: 2025-04-30T16:16:47.150Z
Learning: The Armbian build system references Linux kernel versions in the form "tag:v6.14.4" in the KERNELBRANCH variable, even when point release tags might not be directly visible in the upstream repository in the same form.

Applied to files:

config/sources/mainline-kernel.conf.sh

📚 Learning: 2025-07-21T04:12:02.439Z

Learnt from: EvilOlaf
PR: armbian/build#0
File: :0-0
Timestamp: 2025-07-21T04:12:02.439Z
Learning: In the Armbian build system, for recurring maintenance tasks like kernel version bumping, TODO comments should use generic version formats (e.g., "MAJOR.MINOR-rc1") rather than specific version numbers (e.g., "6.17-rc1") to avoid the need for frequent comment updates that would create unnecessary maintenance overhead.

Applied to files:

config/sources/mainline-kernel.conf.sh

🧬 Code graph analysis (1)

config/sources/mainline-kernel.conf.sh (2)

config/sources/vendors/microsoft/wsl2.hooks.sh (2)

post_family_config_branch_current__wsl2 (14-19)

post_family_config_branch_edge__wsl2 (21-26)

lib/functions/compilation/armbian-kernel.sh (1)

armbian_kernel_config__netkit (46-53)

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 · 2025-10-10T06:15:48Z

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

…armbian#8737) - when X is released, please update it to X+1-rc1 - otherwise we miss on stable updates

* live_main_upstream/main: (236 commits) qemu-uboot-{x86|arm64}: bump u-boot to v2025.10 final mixtile-blade3: bump edge u-boot to v2025.10 final cm3588-nas: bump u-boot to v2025.10 final cm3588-nas: u-boot: bump 2025.01 -> 2025.10-rc4 nanopct6(-lts): bump u-boot to v2025.10 final nanopct6(-lts): u-boot: bump 2025.04 -> 2025.10-rc4 nanopi-r3s-lts: board config maint bsp armbian-ramlog - move HDD_LOG declaration before sourcing /etc/default/armbian-ramlog don't do clever things when using overridden HDD_LOG `Automatic` board configs status synchronise nanopi-m6: add support for mainline uboot (armbian#8793) mainline uboot doesnt work with vendor kernel get rid of vendor uboot, adjust aic8800 fix typo and brackets bump uboot to latest stable, simplify logic opi5plus - board config maintenance (armbian#8787) rk35xx, rockchip-rk3588: fix pre_config_uboot_target prevent board-specific hooks from running `Automatic` board configs status synchronise rockchip64-6.18: add DT patches for NPU on T6(-LTS) and CM3588-NAS rockchip64-6.18: fix `net-phy-realtek-add-rtl8211x-LED-configuration-from-OF` for v6.18-rc2 rockchip64-6.18: drop upstreamed DT changes for R6*, T6, CM3588-NAS (USB3/HDMI-RX) rockchip64-6.18: rewrite/rebase patches - no changes - vs v6.18-rc2 mainline-kernel: bump 6.18 to `-rc2` Add warning for rockchip uboot on modern hosts SpacemiT: Update `EDGE` to linux-6.17.y Move to supported, drop device tree as it was merged to the kernel repository add r58-4x4 meson64-6.18: rewrite patches meson64: bump edge 6.17 -> 6.18 meson64-6.18: bump 6.17 -> 6.18 via rename rockchip64-6.18: .config: `CONFIG_DRM_ACCEL_ROCKET=m` drivers_network: update `rtl8723DS` with amazingfate's fix for 6.18 drivers_network: update `rtl8852bs` with amazingfate's fix for 6.18 rockchip64-6.18: rewrite/rebase patches - no changes rockchip64-6.18: media-0001-Add-rkvdec-Support-v5: drop upstreamed patch (:12) rockchip64-6.18: update patches rockchip64_common: bump edge to 6.18 uefi-arm64-6.18: fix net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue uefi-arm64-edge: bump edge 6.17 -> 6.18 via rename uefi-loong64-edge: bump to 6.18 uefi: bump edge to 6.18 Add wget to prepare-host.sh (armbian#8779) armsom-forge1: add uboot patch to enable booting from btrfs partition armsom-forge1: change BOOTCONFIG to its own partitioning: allow single root partition for all filesystem type remove wget from build-host basic-deps build machinery - replace wget with curl cuz reasons qcs6490-edge: bump to 6.18 qcs6490-edge: bump to 6.17 armbian-kernel.sh enable zram compression backends: LZ4, LZ4HC, ZSTD, DEFLATE, 842, and LZO rockchip: Add CSC board Luckfox Lyra Zero W filogic patches - tweak 0000.patching_config.yaml filogic - fix for openwrt kernel tree's lack of bpi-r4 sd dtb filogic - enable more kernel modules potential edge kernel for filogic/bananapi BPI-Router-Linux v6.12 as current, chainsx as legacy armsom-forge1: rename dtb name to match mainline build machinery - fixup compilation for uboot/atf BRANCH=edge, pass --no-warn-rwx-segments to linker, not compiler build(deps): bump peter-evans/create-pull-request from 6 to 7 build(deps): bump actions/download-artifact from 4 to 5 build(deps): bump github/codeql-action from 3 to 4 build(deps): bump rich from 14.1.0 to 14.2.0 build(deps): bump actions/checkout from 4 to 5 update rtl88x2cs external driver for kernel 6.18+ `Automatic` board configs status synchronise `Automatic` board configs status synchronise meson64-6.17: edge: .config: enable a bunch of RTL/RTW88 meson64-6.17: edge: .config update, no changes meson64-6.17: arm64: dts: amlogic: Enable the npu node for Radxa Zero 2 meson64-6.17: rewrite/rebase against v6.17.1, no changes meson64-6.17: rework g12b pinmux/pinctrl; thanks to retro98boy meson64-6.17: rework `jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch` meson64-6.17: reworked hwmon-emc2305-fixups-for-driver.patch; thanks to pyavitz meson64-6.17: borrow drv-spi-spidev-remove-warnings.patch from rockchip64 meson64: bump edge to 6.17 meson64: bump to 6.17 via rename meson64-6.16: rewrite/rebase patches vs v6.16.10 linux-uefi-arm64-cloud.config: enable CONFIG_SND_VIRTIO so virtual desktop has sound linux-uefi-arm64-cloud.config: enable CONFIG_INPUT_UINPUT for spice agent Bump u-boot to v2025.10-rc5 for orangepi4-lts Bump u-boot to v2025.10-rc5 for Radxa rockpi-e `Automatic` board configs status synchronise Add Wi-Fi injection patch for Linux 6.12 kernels. bsp: armbian-install: Correct the eMMC indication for some devices. sunxi-6.12: Switch to v6.12.51 sunxi-6.12: re-extract megous patches mixtile-blade3: u-boot: edge: v2025.10-rc3; add dts/u-boot.dtsi/defconfig u-boot: v2025.10: prepare 0000.patching_config.yaml for null-patch-free u-boot mixtile-blade3: use vendor uboot also for legacy branch mixtile-blade3: generic mainline uboot for edge branch Automatic: kernel config rewrite GHA: rewrite kernel configs and open a PR if there are changes Use Debian SID when generating JSONs Add Kernel overlay to reduce eMMC frequency for FriendlyElec NanoPC-T6 boards SMART AM40: Enable native HDMI interface in OPS slot mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1) (armbian#8737) Update rtl88x2cs driver commit hash for kernel 6.17+ don't fail distro agnostic sshd adjustments when config is not found (armbian#8729) `Automatic` board configs status synchronise rockchip64-6.17: add rkvdec patch for rk35xx back extensions: radxa-aic8800: allow 6.17; skip DKMS only on >= 6.18 rockchip64: current: fix display mode patches for rk3588 boards ... Signed-off-by: Jonas Wood <[email protected]>

mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1)

e3cf0a4

- when X is released, please update it to X+1-rc1 - otherwise we miss on stable updates

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, ... labels Oct 9, 2025

rpardini mentioned this pull request Oct 9, 2025

Linux kernel: bump mainline to latest version #8687

Merged

6 tasks

rpardini marked this pull request as ready for review October 9, 2025 19:39

rpardini requested a review from igorpecovnik as a code owner October 9, 2025 19:39

coderabbitai bot requested review from amazingfate, brentr, clee, efectn, prahal and pyavitz October 9, 2025 19:40

EvilOlaf approved these changes Oct 10, 2025

View reviewed changes

EvilOlaf merged commit 191d6db into armbian:main Oct 10, 2025
11 checks passed

github-actions bot added the Ready to merge Reviewed, tested and ready for merge label Oct 10, 2025

github-actions bot removed the Needs review Seeking for review label Oct 10, 2025

EvilOlaf pushed a commit to EvilOlaf/build that referenced this pull request Oct 19, 2025

mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1) (…

66ea17f

…armbian#8737) - when X is released, please update it to X+1-rc1 - otherwise we miss on stable updates

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1) #8737

mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1) #8737

Uh oh!

rpardini commented Oct 9, 2025

Uh oh!

coderabbitai bot commented Oct 9, 2025 •

edited

Loading

Uh oh!

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

Uh oh!

mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1) #8737

mainline-kernel.conf: let 6.17 update further than v6.17 (eg v6.17.1) #8737

Uh oh!

Conversation

rpardini commented Oct 9, 2025

Uh oh!

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

Uh oh!

Walkthrough

Estimated code review effort

Possibly related PRs

Suggested labels

Suggested reviewers

Pre-merge checks and finishing touches

Uh oh!

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

coderabbitai bot commented Oct 9, 2025 •

edited

Loading