This is a regular "kernel-next" merge of the latest available stable tag v6.0.19 into nilrt/master/6.0 bringing the version up to 6.0.19-rt14. It will be the last 6.0.y stable release available upstream [1].
The following trivial merge conflict was resolved in place:
re-number TIF_NEED_RESCHED_LAZY in arch/arm/include/asm/thread_info.h due to conflict with commit d5d25dd73316 ("ARM: renumber bits related to _TIF_WORK_MASK")
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.19 into
nilrt/master/6.0bringing the version up to 6.0.19-rt14. It will be the last 6.0.y stable release available upstream [1].The following trivial merge conflict was resolved in place:
arch/arm/include/asm/thread_info.hdue to conflict with commit d5d25dd73316 ("ARM: renumber bits related to _TIF_WORK_MASK")Testing
[1] https://lore.kernel.org/lkml/1673522302104114@kroah.com/