ni / linux

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

Merge tag 'v5.15.106' into nilrt/master/5.15 #109

Closed gratian closed 1 year ago

gratian commented 1 year ago

This is a regular stable merge of latest linux-stable tag v5.15.106.

No merge conflicts encountered.

Testing

Additional functional and performance testing will be handle by ATSs.

chaitu236 commented 1 year ago

This is a regular stable merge of latest linux-stable tag v5.15.106.

@gratian We're merging 5.15 linux-stable here (instead of linux-stable-rt like usual) - does this imply that linux-stable contains all the rt patches we care about?

gratian commented 1 year ago

@chaitu236 If you are asking if the linux-stable tree has now all the rt patches the answer is no. The rt patches still come from our tree which is based on linux-stable-rt. This just merges the latest fixes in linux-stable into our tree (which already has the rt patches we need).

FWIW It is the same process the linux-stable-rt tree follows i.e. merges form linux-stable with occasional fixes for conflicts with rt patches. In this case there were no conflicts so it's safe to merge directly from stable and not wait for the stable-rt tree to catch up.