Skip to content

T9010: Update Linux Kernel to 6.18.36 and re-fresh Intel OOT driver versions - #1224

Merged
c-po merged 3 commits into
vyos:rollingfrom
c-po:kernel-update-6.18
Jun 24, 2026
Merged

T9010: Update Linux Kernel to 6.18.36 and re-fresh Intel OOT driver versions#1224
c-po merged 3 commits into
vyos:rollingfrom
c-po:kernel-update-6.18

Conversation

@c-po

@c-po c-po commented Jun 22, 2026

Copy link
Copy Markdown
Member

Change summary

Regular Linux Kernel version update

Also bump the Intel OOT driver versions which ghained official support for RHEL 9.8, RHEL 10.2 and Ubuntu 26.04 - which means we can drop one of our custom patches which added support for Kernel 6.18

Update versions:

  • igb v5.20.28
  • ixgbe v6.4.4
  • ixgbevf v5.3.36
  • i40e v2.30.18
  • ice v2.6.6
  • iavf v4.13.35

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

How to test / Smoketest result

Embedded Smoketests

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@c-po
c-po requested review from jestabro and sever-sever June 22, 2026 19:28
@coderabbitai

coderabbitai Bot commented Jun 22, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 1c4233d2-d301-46a4-aba8-da3033c041f1

📥 Commits

Reviewing files that changed from the base of the PR and between 8d82fec and 8e245f0.

📒 Files selected for processing (3)
  • scripts/package-build/linux-kernel/build-intel-nic.sh
  • scripts/package-build/linux-kernel/package.toml
  • scripts/package-build/linux-kernel/patches/i40e/0004-i40e_client-use-ida_alloc-ida_free.patch
🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

  • ansible/ansible (manual)
💤 Files with no reviewable changes (1)
  • scripts/package-build/linux-kernel/patches/i40e/0004-i40e_client-use-ida_alloc-ida_free.patch
✅ Files skipped from review due to trivial changes (2)
  • scripts/package-build/linux-kernel/build-intel-nic.sh
  • scripts/package-build/linux-kernel/package.toml
📜 Recent review details
⏰ Context from checks skipped due to timeout. (5)
  • GitHub Check: build_iso
  • GitHub Check: codeql-analysis-call / Analyze (python)
  • GitHub Check: Mergify Merge Queue
  • GitHub Check: Mergify Merge Protections
  • GitHub Check: Summary
🧰 Additional context used
🔍 Remote MCP

Based on the search results, I have gathered relevant context to help with reviewing this PR. Let me compile the key findings:

Relevant Context for PR Review

Linux Kernel 6.18.36 Status

Linux kernel 6.18.36 was released on June 19, 2026, and 6.18.35 was released on June 9, 2026. Version 6.18.36 contains important fixes.

Intel i40e Driver v2.30.18 - Key Support Addition

The i40e-2.30.18 release adds support for RHEL 9.8, RHEL 10.2, and includes minor bugfixes and improvements. Additionally, the v2.30.12 release added support for Ubuntu 26.04 LTS.

This confirms the PR objective that the updated drivers now officially support RHEL 9.8, RHEL 10.2, and Ubuntu 26.04, as stated in the PR summary.

Intel ice Driver v2.6.6 Availability

The ice Linux Base Driver version 2.6.6 is for the 800 series devices, confirming the driver version specified in the PR.

Kernel 6.18 Support Context

The PR mentions removing a custom patch that provided Kernel 6.18 support. The search results indicate that newer driver versions contain features not yet merged upstream and are updated more frequently than in-tree kernel drivers, which explains why these out-of-tree driver updates now provide native Kernel 6.18 support without needing custom patches.

Build Script Changes

The PR correctly updates the build cleanup script to remove both the generated Debian directory and post-install script file, ensuring complete removal of packaging artifacts.

Patch Removal Context

The removal of the 0004-i40e_client-use-ida_alloc-ida_free.patch patch (37 lines deleted) aligns with the PR objective that the updated i40e v2.30.18 driver now officially supports Kernel 6.18, eliminating the need for this compatibility patch.


📝 Walkthrough

Summary by CodeRabbit

  • Chores
    • Updated Linux kernel to version 6.18.36
    • Updated Intel Ethernet NIC drivers (igb, ixgbe, ixgbevf, i40e, ice, iavf) to newer compatible versions
  • Bug Fixes
    • Improved Intel i40e auxiliary device ID handling to use the correct allocation/freeing behavior
    • Enhanced the Linux kernel build cleanup to remove generated packaging artifacts (including post-install outputs) after building

Walkthrough

Bumps kernel_version from 6.18.34 to 6.18.36 in data/defaults.toml, updates commit_id tags for six Intel NIC drivers (igb, ixgbe, ixgbevf, i40e, ice, iavf) in package.toml, and extends the cleanup step in build-intel-nic.sh to also remove ${DEBIAN_POSTINST}.

Changes

Kernel and Intel NIC Driver Updates

Layer / File(s) Summary
Kernel version and Intel NIC driver commit_id bumps
data/defaults.toml, scripts/package-build/linux-kernel/package.toml
kernel_version set to 6.18.36; commit_id values updated for igbv5.20.28, ixgbev6.4.4, ixgbevfv5.3.36, i40ev2.30.18, icev2.6.6, iavfv4.13.35.
Build script cleanup fix
scripts/package-build/linux-kernel/build-intel-nic.sh
Cleanup at line 81 now removes both ${DEBIAN_DIR} and ${DEBIAN_POSTINST}, preventing leftover post-install script artifacts.

Possibly related PRs

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed Title accurately summarizes the main changes: Linux Kernel update to 6.18.36 and Intel OOT driver version bumps.
Description check ✅ Passed Description is directly related to the changeset, providing context for kernel version update, driver version bumps, and removal of custom patches.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

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

✨ Finishing Touches
✨ Simplify code
  • Create PR with simplified code

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

@mergify mergify Bot added the rolling label Jun 22, 2026
@mergify mergify Bot assigned c-po Jun 22, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@scripts/package-build/linux-kernel/build-intel-nic.sh`:
- Line 81: In the rm command on line 81, the variables ${DEBIAN_DIR} and
${DEBIAN_POSTINST} are unquoted, which can cause word-splitting and globbing
vulnerabilities. Quote both variable expansions (wrap them in double quotes) and
add the `--` separator after the flags to clearly separate the rm options from
the arguments being deleted.

In `@scripts/package-build/linux-kernel/package.toml`:
- Around line 52-65: The scm_url values for the three Intel NIC packages
(ixgbevf, i40e, and ice) in the package.toml file are using insecure http://
protocol instead of https://. Change each of the three scm_url entries for these
packages from "http://github.com/intel/..." to "https://github.com/intel/..." to
ensure secure source integrity during the clone operation.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 65cde0e8-9c82-4e49-b0bc-9ba19f16fc78

📥 Commits

Reviewing files that changed from the base of the PR and between 6f3f7b7 and 8d82fec.

📒 Files selected for processing (3)
  • data/defaults.toml
  • scripts/package-build/linux-kernel/build-intel-nic.sh
  • scripts/package-build/linux-kernel/package.toml
🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

  • ansible/ansible (manual)
📜 Review details
⏰ Context from checks skipped due to timeout. (4)
  • GitHub Check: build_iso
  • GitHub Check: codeql-analysis-call / Analyze (python)
  • GitHub Check: Mergify Merge Protections
  • GitHub Check: Summary
🧰 Additional context used
🪛 Shellcheck (0.11.0)
scripts/package-build/linux-kernel/build-intel-nic.sh

[info] 81-81: Double quote to prevent globbing and word splitting.

(SC2086)


[info] 81-81: Double quote to prevent globbing and word splitting.

(SC2086)

🔇 Additional comments (2)
data/defaults.toml (1)

17-17: LGTM!

scripts/package-build/linux-kernel/package.toml (1)

39-41: LGTM!

Also applies to: 45-47, 51-51, 57-57, 63-63, 69-69

Comment thread scripts/package-build/linux-kernel/build-intel-nic.sh Outdated
Comment thread scripts/package-build/linux-kernel/package.toml
c-po added 2 commits June 23, 2026 06:40
Update versions:
* igb v5.20.28
* ixgbe v6.4.4
* ixgbevf v5.3.36
* i40e v2.30.18
* ice v2.6.6
* iavf v4.13.35
@c-po
c-po force-pushed the kernel-update-6.18 branch from 8d82fec to 8e245f0 Compare June 23, 2026 04:42
@github-actions

Copy link
Copy Markdown

CI integration 👍 passed!

Details

CI logs

  • Config tests 👍 passed

@sever-sever sever-sever left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Regular Kernel update
Update Intel drivers
Nice to test it in the rolling.

@jestabro jestabro left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Update kernel version and Intel OOT driver versions.

@mergify

mergify Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@c-po
c-po merged commit 932a4a8 into vyos:rolling Jun 24, 2026
14 of 15 checks passed
@vyos-bot vyos-bot Bot added mirror-initiated This PR initiated for mirror sync workflow mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow labels Jun 24, 2026
@c-po
c-po deleted the kernel-update-6.18 branch July 2, 2026 05:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

3 participants