From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1DF63C6FD1C
	for <stable@archiver.kernel.org>; Sat, 25 Mar 2023 00:43:11 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231447AbjCYAnK (ORCPT <rfc822;stable@archiver.kernel.org>);
        Fri, 24 Mar 2023 20:43:10 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39586 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229522AbjCYAnJ (ORCPT
        <rfc822;stable@vger.kernel.org>); Fri, 24 Mar 2023 20:43:09 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F003E2132
        for <stable@vger.kernel.org>; Fri, 24 Mar 2023 17:43:08 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by dfw.source.kernel.org (Postfix) with ESMTPS id 8B92862D18
        for <stable@vger.kernel.org>; Sat, 25 Mar 2023 00:43:08 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0DDAC433EF;
        Sat, 25 Mar 2023 00:43:07 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
        s=k20201202; t=1679704988;
        bh=VC4LrXIF04CB9UI3YL7KBxUU3Rgd8E+cXX5umTXNqcg=;
        h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
        b=aKc3auWvJwwER8r1iZLbtkD18t/mdt2Ns/Dzn+6VHgL/hqq4bz0JyXR4FNCtszAut
         UXypxn5d1Uxuy42qx23BZAhsot2gYmlkN9ieRnq4Q1ZRF3aMWCa+zjqvogQri18tU5
         0B3BBPrn9swc0amUR7LBi2i6w+d+XgCgRFrTaaYXysoHOBz8bgx1qYL9LX0u2UTZE/
         Ad9gNL/MPsIrbw1/yIAETrfrYMgOddXYiIriIFOena+gdFF9siFNKTdDs26/uEvBtq
         LF7F4bykE2Vv69oahenGsYp2AEVRdRDuMb8u19ewHG0FHGSw0TNKs8ng16ej748nQR
         2p+PiRBIK546g==
Date:   Fri, 24 Mar 2023 20:43:06 -0400
From:   Sasha Levin <sashal@kernel.org>
To:     Matthieu Baerts <matthieu.baerts@tessares.net>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Paolo Abeni <pabeni@redhat.com>, stable@vger.kernel.org,
        mptcp@lists.linux.dev, Christoph Paasch <cpaasch@apple.com>,
        Jakub Kicinski <kuba@kernel.org>
Subject: Re: [PATCH 6.1 0/2] mptcp: Stable backports for v6.1
Message-ID: <ZB5Dmt1lm/4Js3di@sashalap>
References: <20230323-upstream-stable-conflicts-6-1-v1-0-ef2a6180eaf3@tessares.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <20230323-upstream-stable-conflicts-6-1-v1-0-ef2a6180eaf3@tessares.net>
Precedence: bulk
List-ID: <stable.vger.kernel.org>
X-Mailing-List: stable@vger.kernel.org

On Thu, Mar 23, 2023 at 06:49:00PM +0100, Matthieu Baerts wrote:
>Hi Greg, Sasha,
>
>Recently, 3 patches related to MPTCP have not been backported due to
>conflicts:
>
> - 3a236aef280e ("mptcp: refactor passive socket initialization")
> - b6985b9b8295 ("mptcp: use the workqueue to destroy unaccepted sockets")
> - 0a3f4f1f9c27 ("mptcp: fix UaF in listener shutdown")
>
>Yesterday, Sasha has resolved the conflicts for the first one and he has
>already added this one to v6.1.
>
>In fact, this first patch is a requirement for the two others.
>
>I then here resolved the conflicts for the two other patches, documented
>that in each patch and ran our tests suite. Everything seems OK.
>
>Do you mind adding these two patches to v6.1 queue as well if you don't
>mind?

Queued up, thanks!

-- 
Thanks,
Sasha