The patch below does not apply to the 5.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-5.10.y git checkout FETCH_HEAD git cherry-pick -x 4dde0d72ccec500c60c798e036b852e013d6e124 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024080723-untangled-rogue-da43@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 4dde0d72ccec ("mptcp: mib: count MPJ with backup flag") b3ea6b272d79 ("mptcp: consolidate initial ack seq generation") f3589be0c420 ("mptcp: never shrink offered window") 74c7dfbee3e1 ("mptcp: consolidate in_opt sub-options fields in a bitmask") a086aebae0eb ("mptcp: better binary layout for mptcp_options_received") 8d548ea1dd15 ("mptcp: do not set unconditionally csum_reqd on incoming opt") eb7f33654dc1 ("mptcp: add the mibs for MP_FAIL") 478d770008b0 ("mptcp: send out MP_FAIL when data checksum fails") 5580d41b758a ("mptcp: MP_FAIL suboption receiving") f444fea7896d ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
