Merge 'v6.18.35-rt5' and 'v6.18.36' tags into nilrt/master/6.18#282
Merged
gratian merged 5928 commits intoJun 22, 2026
Conversation
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.
This is a regular merge of the latest
devel-rttagv6.18.35-rt5followed by the lateststabletagv6.18.36. This brings thenilrt/master/6.18branch inline with the latest versions available upstream.A trivial conflict between our commit de7a404 ("usb: dwc3: call _DSM for core soft reset") and upstream commit 476ee63 ("usb: dwc3: Add dwc pointer to dwc3_readl/writel") was resolved in place by retaining the modified upstream code.
AB#3738521
Testing
ni-si514driver, which is a known issue tracked by #AB3902174