Merge tag 'v5.15.86-rt56' into nilrt/master/5.15

[mike-petersen-ni]

Conflicts

There was just one conflict.

drivers/tty/serial/8250/8250_omap.c

line 344@ours, 347@theirs, 347@resolved

++<<<<<<< ours
++      up->port.ops->set_mctrl(&up->port, up->port.mctrl);
++||||||| base
 +      up->port.ops->set_mctrl(&up->port, up->port.mctrl);
++
++      if (up->port.rs485.flags & SER_RS485_ENABLED)
++              serial8250_em485_stop_tx(up);
++=======
+       __omap8250_set_mctrl(&up->port, up->port.mctrl);
+
+       if (up->port.rs485.flags & SER_RS485_ENABLED)
+               serial8250_em485_stop_tx(up);
++>>>>>>> theirs

Resolved in place by taking theirs (76db05ab70925f34fbb8c75a2a4ca2ab39c8c9cd) but removing the conditional which was intentionally removed with a revert from us (9ce2640de515dfa5d4542de1883075a5ff535b66):

      __omap8250_set_mctrl(&up->port, up->port.mctrl);

Testing

• [X] Built
• [X] Booted on a cRIO-9042