search

ni / linux

Linux kernel source for NI Linux Real-Time
Other
80 stars 77 forks source link

Merge tag 'v6.6.99-rt44' into nilrt/master/6.6 #166

Closed erickshepherdNI closed 1 month ago

erickshepherdNI commented 1 month ago

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

TESTING