ni / linux

Linux kernel source for NI Linux Real-Time
Other
81 stars 78 forks source link

Upgrade 'next' development branch nilrt/master/6.0 to 6.0.5 rt14 #86

Closed chaitu236 closed 2 years ago

chaitu236 commented 2 years ago

This is the i11 'next' branch minor upgrade for nilrt/master/6.0 from v6.0-rt11 to 6.0.5 rt14.

There was a merge conflict between

which was resolved by using upstream's changes (1f00783).

WI: 2131177

Testing

Verified that the kernel boots on cRIO-9034, cRIO-9042, PXIe-8861 and a VM.

Note

dmesg diff and ptest testing will be done by automated tests when this is submitted.