Merge tag 'v6.1.38-rt12' into nilrt/master/6.1

[dylan-matthew-turner]

Justification

This is a regular stable merge of the latest available linux-stable-rt tag v6.1.38-rt12.

AB#2395763

There were just two conflicts:

drivers/usb/dwc3/core.h

<<<<<<< HEAD (ours)
* @has_dsm_for_softreset: set if we want to use BIOS to do core soft reset
=======
* @suspended: set to track suspend event due to U3/L2.
>>>>>>> v6.1.38-rt12 (theirs)

Resolved in place by keeping both. We added has_dsm_for_softreset in (e65d593), and they added suspended in (1ec1452), but neither change is in conflict except these doc comments.

We'd obviously want both sets of doc comments, since after the merge we'll have both struct members.

mm/maccess.c

<<<<<<< HEAD
#include <linux/syscalls.h>
=======
#include <asm/tlb.h>
>>>>>>> v6.1.38-rt12

Similar case here. We added a syscall and needed the syscall library (9f4788d), and they changed copy_from_user_nofault and needed the asm/tlb.h library (2e7ad87), but the only conflict happens to be in the includes, so we can simply keep both includes.

Testing

• Deployed rebuilt kernel to cRIO-9037
• Set up and ran dkms autoinstall with the new kernel version
• Checked dmesg for obvious errors

[dylan-matthew-turner]

Ignore the duplicated commit in the PR feed; it's not in the log. I signed off with the wrong email and had to rebase, amend the message, and re-push

[dylan-matthew-turner]

II redid the merge.

[dylan-matthew-turner]

Fixed