The patch below does not apply to the 6.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y git checkout FETCH_HEAD git cherry-pick -x 87eb3cb4ec619299cd5572e1d5eb68aef4074ac2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024090909-goes-yogurt-80fa@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^.. Possible dependencies: 87eb3cb4ec61 ("usb: typec: ucsi: Fix cable registration") c313a44ac9cd ("usb: typec: ucsi: Always set number of alternate modes") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
