search

ni / linux

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

Dev/psn/6.1 kernel upstream merge #159

Closed pratheekshasn closed 4 months ago

pratheekshasn commented 4 months ago

Upstream merge for the linux kernel on the kirkstone branch.

Merged a conflict in gadget.c, added a line of code from the upstream branch: mdelay(1);

gratian commented 4 months ago

We can drop this draft in favor of https://github.com/ni/linux/pull/161

gratian commented 4 months ago

Closing in favor of merged PR https://github.com/ni/linux/pull/161