Hi Greg, On 04/10/2023 16:04, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > The patch below does not apply to the 4.14-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-4.14.y > git checkout FETCH_HEAD > git cherry-pick -x d5fbeff1ab812b6c473b6924bee8748469462e2c > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023100424-rumor-garter-af90@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. We can drop this patch that has been picked for 4.14, 4.19, 5.4 and 5.10 trees. > ------------------ original commit in Linus's tree ------------------ > > From d5fbeff1ab812b6c473b6924bee8748469462e2c Mon Sep 17 00:00:00 2001 > From: Paolo Abeni <pabeni@xxxxxxxxxx> > Date: Sat, 16 Sep 2023 12:52:46 +0200 > Subject: [PATCH] mptcp: move __mptcp_error_report in protocol.c > > This will simplify the next patch ("mptcp: process pending subflow error > on close"). > > No functional change intended. > > Cc: stable@xxxxxxxxxxxxxxx # v5.12+ I just re-read the documentation [1] and it looks like I should have used '# 5.12.x' comment instead of '# v5.12+'. I guess that's why the patch got selected to be backported up to 4.14 instead of 5.12. I'm sorry for that, I will make sure not to re-do that again! Cheers, Matt
