Skip to content

Merge 'v6.18.35-rt5' and 'v6.18.36' tags into nilrt/master/6.18#282

Merged
gratian merged 5928 commits into
ni:nilrt/master/6.18from
gratian:dev/nilrt/master/6.18.36-rt5
Jun 22, 2026
Merged

Merge 'v6.18.35-rt5' and 'v6.18.36' tags into nilrt/master/6.18#282
gratian merged 5928 commits into
ni:nilrt/master/6.18from
gratian:dev/nilrt/master/6.18.36-rt5

Conversation

@gratian

@gratian gratian commented Jun 22, 2026

Copy link
Copy Markdown

This is a regular merge of the latest devel-rt tag v6.18.35-rt5 followed by the latest stable tag v6.18.36. This brings the nilrt/master/6.18 branch 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

  • Built the kernel locally, installed on a cRIO-9049, and confirmed the device boots correctly and without errors
  • Successfully re-versioned NI drivers via dkms. The only observed failure was in the ni-si514 driver, which is a known issue tracked by #AB3902174

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.