Update Linux to 6.18 - #4191
Open
sayanchowdhury wants to merge 4 commits into
Open
Conversation
Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
…6.18 Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
sayanchowdhury
requested a deployment
to
development
August 6, 2026 14:24 — with 
GitHub Actions
Waiting
GitHub Actions
Waiting
There was a problem hiding this comment.
Pull request overview
This PR updates the Flatcar/CoreOS kernel stack to Linux 6.18.26, including new kernel sources/modules/kernel ebuilds, updated kernel configuration for amd64/arm64, and compatibility fixes for the legacy NVIDIA 550.163.01 driver against newer kernel APIs.
Changes:
- Bump kernel sources to 6.18.26 (new
coreos-sources,coreos-modules,coreos-kernelebuilds + updated Manifest). - Add/refresh downstream kernel patch set under
coreos-sources/files/6.18/(secure-boot/lockdown-related, build tooling tweaks). - Extend
old-nvidia-drivers-550.163.01to support kernels up to 6.18 via additional patching andsrc_prepareadjustments.
Reviewed changes
Copilot reviewed 23 out of 23 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| sdk_container/src/third_party/coreos-overlay/x11-drivers/old-nvidia-drivers/old-nvidia-drivers-550.163.01-r2.ebuild | Bump supported kernel max to 6.18 and add NVIDIA 550 build-fix patches + in-tree sed adjustments. |
| sdk_container/src/third_party/coreos-overlay/x11-drivers/old-nvidia-drivers/files/0001-mm-use-vm_flags_reset-to-avoid-GPL-only-vma_start_wr.patch | Adapts NVIDIA mm/VMA flag helpers for Linux 6.15+ GPL/export changes. |
| sdk_container/src/third_party/coreos-overlay/x11-drivers/old-nvidia-drivers/files/0002-nvidia-drm-550.163.01-pass-drm_format_info-to-nv_drm.patch | Updates NVIDIA DRM fb_create plumbing for Linux 6.17+ API change (format info param). |
| sdk_container/src/third_party/coreos-overlay/x11-drivers/old-nvidia-drivers/files/0003-nvidia-use-hrtimer_setup-for-Linux-6.15.patch | Switches to hrtimer_setup() for Linux 6.15+ in the open kernel module path. |
| sdk_container/src/third_party/coreos-overlay/x11-drivers/old-nvidia-drivers/files/0004-nvidia-uvm-guard-iommu_dev_enable_disable_feature-fo.patch | Guards removed IOMMU SVA enable/disable calls for Linux 6.16+. |
| sdk_container/src/third_party/coreos-overlay/x11-drivers/old-nvidia-drivers/files/0005-nvidia-uvm-guard-SMMU-WAR-code-with-UVM_ATS_SMMU_WA.patch | Makes ARM64 SMMU WAR code conditional to avoid non-ARM build issues. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest | Adds distfiles entries for linux-6.18 + patch-6.18.26. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.18.26.ebuild | New kernel sources ebuild for 6.18.26 with patch list for Flatcar deltas. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0001-pahole-support-reproducible-builds.patch | Enables reproducible-build support in pahole flags. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0002-Revert-x86-boot-Remove-the-bugger-off-message.patch | Reverts upstream removal needed for dm-verity hash storage per commit message. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0003-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch | Adds EFI secure boot flag plumbing and secureboot.c addition. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0003-efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch | Duplicate alternate-form patch file for EFI secure boot flag plumbing. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0004-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | Adds lockdown-on-secure-boot behavior and related Kconfig/API changes. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0004-efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | Duplicate alternate-form patch file for secure-boot lockdown. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0005-mtd-phram-slram-Disable-when-the-kernel-is-locked-do.patch | Disables phram/slram mappings under kernel lockdown (security hardening). |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0005-mtd-disable-slram-and-phram-when-locked-do.patch | Duplicate alternate-form patch file for phram/slram lockdown behavior. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0006-arm64-add-kernel-config-option-to-lock-down-when-in-.patch | Adds arm64 secure-boot lockdown config/plumbing via FDT params. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.18/z0007-tools-hv-fix-cross-compilation-for-ARM64.patch | Fixes Hyper-V tools Makefile logic for ARM64 cross builds. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.18.26.ebuild | New modules ebuild for 6.18.26: builds vmlinux+modules and installs minimal build tree. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.18 | New shared kernel config fragment for 6.18 (common options). |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.18 | New amd64-specific config fragment for 6.18. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.18 | New arm64-specific config fragment for 6.18. |
| sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.18.26.ebuild | New kernel build/install ebuild for 6.18.26 (dracut/bootengine integration). |
Suppressed comments (1)
sdk_container/src/third_party/coreos-overlay/x11-drivers/old-nvidia-drivers/old-nvidia-drivers-550.163.01-r2.ebuild:167
- Same issue as above:
\bis not a portable/working word-boundary in sed. If this substitution doesn't match,del_timer_sync()won't be renamed and the build will still fail on kernels where it was renamed/removed. Prefer\</\>for word boundaries.
find "${S}" \( -name '*.c' -o -name '*.h' \) \
-exec sed -i 's/\bdel_timer_sync\b/timer_delete_sync/g' {} + || die
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+161
to
+162
| find "${S}" \( -name 'Kbuild' -o -name 'Makefile' \) \ | ||
| -exec sed -i 's/\bEXTRA_CFLAGS\b/ccflags-y/g' {} + || die |
Comment on lines
+13
to
+15
| inherit kernel-2 | ||
| EXTRAVERSION="-flatcar" | ||
| detect_version |
Comment on lines
+141
to
+143
| +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0) | ||
| + const struct drm_format_info *info, | ||
| +#endif |
Comment on lines
+1
to
+5
| From: Ben Hutchings <ben@decadent.org.uk> | ||
| Date: Fri, 30 Aug 2019 15:54:24 +0100 | ||
| Subject: mtd: phram,slram: Disable when the kernel is locked down | ||
| Forwarded: https://lore.kernel.org/linux-security-module/20190830154720.eekfjt6c4jzvlbfz@decadent.org.uk/ | ||
|
|
Comment on lines
+1
to
+5
| From: Ben Hutchings <ben@decadent.org.uk> | ||
| Date: Tue, 10 Sep 2019 11:54:28 +0100 | ||
| Subject: efi: Lock down the kernel if booted in secure boot mode | ||
|
|
||
| Based on an earlier patch by David Howells, who wrote the following |
Comment on lines
+1
to
+5
| From: David Howells <dhowells@redhat.com> | ||
| Date: Mon, 18 Feb 2019 12:45:03 +0000 | ||
| Subject: [28/30] efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode | ||
| Origin: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit?id=a5d70c55c603233c192b375f72116a395909da28 | ||
|
|
dongsupark
moved this to ⚒️ In Progress
in Flatcar tactical, release planning, and roadmap
dongsupark
reviewed
Aug 6, 2026
dongsupark
left a comment
dongsupark
left a comment
Member
There was a problem hiding this comment.
I think we should run Jenkins CI for all providers, especially for such a big Kernel bump.
| CONFIG_CPU_FREQ_STAT=y | ||
| # CONFIG_CROSS_MEMORY_ATTACH is not set | ||
| CONFIG_CRYPTO_AES=m | ||
| CONFIG_CRYPTO_CRC32C=y |
Member
There was a problem hiding this comment.
Why is the kernel config CRYPTO_CRC32C is needed for building old nvidia drivers?
| @@ -0,0 +1,155 @@ | |||
| From d1154945f8b2d22392d30a5e522612dfbcf17cff Mon Sep 17 00:00:00 2001 | |||
Member
There was a problem hiding this comment.
Huge thanks for working on old nvidia drivers.
When I was recently touching those, I was wondering if it would worth keeping this one, because of a huge amount of build issues with newer Kernel versions. Ideally we should deprecate them...? ;-)
ader1990
reviewed
Aug 7, 2026
| @@ -0,0 +1,140 @@ | |||
| # CONFIG_ACPI_AC is not set | |||
Contributor
There was a problem hiding this comment.
the *-6.12 files from this folder need to be removed, same with files from the coreos-sources folder.
ader1990
reviewed
Aug 7, 2026
|
|
||
| diff --git a/tools/hv/Makefile b/tools/hv/Makefile | ||
| index 34ffcec264ab..7a7ece3cdf03 100644 | ||
| --- a/tools/hv/Makefile |
Contributor
There was a problem hiding this comment.
There were some new patches recently, maybe we can reuse the official one instead of this one: torvalds/linux@ca5ee0e
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Testing done
CI: https://jenkins.flatcar.org/job/container/job/packages_all_arches/490/
changelog/directory (user-facing change, bug fix, security fix, update)/bootand/usrsize, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.