Merge tag 'v6.1.99-rt36' into nilrt/master/6.1

ni / linux

Linux kernel source for NI Linux Real-Time

Other

80 stars 77 forks source link

Closed erickshepherdNI closed 1 month ago

erickshepherdNI commented 1 month ago

Fix one conflict with https://github.com/erickshepherdNI/linux/commit/32b76505ba18cbbfd7c41f7962937bea5481502c ("mmc: sdhci: Add support for "Tuning Error" interrupts") in favor of our https://github.com/erickshepherdNI/linux/commit/13dc7b7f158917dec94d79bdd4abea66f4f7e6ae ("mmc: sdhci: Handle tuning error interrupts"). This was done in a separate commit after the merge.

gratian commented 1 month ago

Re-worded the commit message for "Revert "mmc: sdhci: Add support for "Tuning Error" interrupts"" to include information on why we are doing the revert and add links to mailing list discussion and associated work item id.
Validated that the SDHCI kernel splat doesn't show up after the revert on a cRIO-9053.
Validated NI drivers re-version correctly via dkms on a cRIO-9042.

The merge was completed outside the GitHub UI. Closing this PR.