This is a regular "kernel-next" merge of the latest available stable tag v6.0.18 into nilrt/master/6.0.
The following merge conflicts were resolved in place:
trivial conflict with 5f3b52f3479b ("ipvs: use u64_stats_t for the per-cpu counters") was resolved by using the 'u64_stats_read()' accessor introduced by the aforementioned commit.
conflict between commit 4ad678a2ea61 ("serial: 8250: 8250_omap: Avoid RS485 RTS glitch on ->set_termios()")
and commit 0f3352c867ee ("serial: 8250: implement write_atomic") was resolved by merging relevant lines from both in drivers/tty/serial/8250/8250_omap.c
Testing
[x] boot tested on cRIO-9043, and PXIe-8821.
[x] spot checked kernel log for errors.
[x] re-versioned NI drivers on cRIO-9043 via dkms autoinstall and verified there are no errors.
This is a regular "kernel-next" merge of the latest available stable tag v6.0.18 into nilrt/master/6.0.
The following merge conflicts were resolved in place:
drivers/tty/serial/8250/8250_omap.cTesting
cRIO-9043, andPXIe-8821.cRIO-9043viadkms autoinstalland verified there are no errors.