Kernel 6.18.31 update#31
Merged
Merged
Conversation
Conflicts: scripts/package-build/linux-kernel/platform/ti-evm/bookworm-am64xx-evm/patches/kernel/0003-pcie-error-fix.patch scripts/package-build/linux-kernel/platform/ti-evm/bookworm-am64xx-evm/patches/kernel/0004-add-uart3-am642-evm.patch scripts/package-build/linux-kernel/platform/ti-evm/bookworm-am64xx-evm/patches/kernel/0005-modify-default-uart-console.patch scripts/package-build/linux-kernel/platform/ti-evm/bookworm-am64xx-evm/patches/kernel/0006-update-gpio-config.patch scripts/package-build/linux-kernel/platform/ti-evm/bookworm-am64xx-evm/patches/kernel/0007-ftpm-am642-evm.patch scripts/package-build/linux-kernel/platform/ti-evm/bookworm-am64xx-evm/patches/kernel/0008-rtc-rv3028.patch This merges Jack's b7a3460 6.18.x.kernel updates with psl-master. The removed patches were still in the old psl-master since it was geared to 6.6.x
…cripts Conflicts: scripts/package-build/libhtp/.gitignore This is cherry-picking the VyOS 9406ad3 for a cleaner history.
*REMOVE*
scripts/package-build/linux-kernel/platform/ti-evm/bookworm-am64xx-evm/patches/kernel/0009-ttyS-iolan.patch
because it is hopelessly incompatible with the new 6.18.31 kernel.
It needs to be reimplemented.
jkim71
approved these changes
Jun 26, 2026
ShuZhou16
approved these changes
Jun 26, 2026
diyguy88
approved these changes
Jun 26, 2026
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
5 participants
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.
This update involves 9 cherry-picked commits diverging from psl-master 4b32a04
mostly taken from origin/dts-fix which makes the current build work
with the 6.18.31 kernel.
However, the old 0009-ttyS-iolan.patch for trueport has been
removed since Shu does not yet have a working replacement for
the new kernel.
Summary of cherry picked updates: