From patchwork Mon May 16 01:14:35 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12850195
Return-Path: <netdev-owner@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 7F3DFC433EF
	for <netdev@archiver.kernel.org>; Mon, 16 May 2022 01:14:49 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S239004AbiEPBOr (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Sun, 15 May 2022 21:14:47 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33132 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S236470AbiEPBOr (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sun, 15 May 2022 21:14:47 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C705BF76;
        Sun, 15 May 2022 18:14:43 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4L1h9n4gxCz4xZ2;
        Mon, 16 May 2022 11:14:37 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1652663679;
        bh=DOzVSuiLWwoYauUsaFUFtUlDaTPA5dFC/+2t4lAmiiQ=;
        h=Date:From:To:Cc:Subject:From;
        b=sz3TvfnJY8/DEszo2jtX9bR2X2E6DMRuEIuGGe1dQWldZLo/Er3IjTt9bb4MQIXZg
         51oi+N72LCnpd0XZtTnnBhm6zcnNj161w4nwo6q0Vjx/XQ5aReIhPvPGBh6W7o7TS/
         HFKXzNQWXFlK+5ZBE9X7ilZzQUAP5E3Ykif10aLjYtXXnS7P6seYRRHEYUqPH+TkBc
         iuRInUIWZ88OnzgICWtrr1gu6e7h7Xwlwlxzuc+Hn9dCOvLWaNB3yu3iIAL4QIe335
         I0vthRCHJSacyFbvcuZ9W0fWcfExTz2B+bl4o28hDEVP2tCpX3u3YrsgyPiI2tz49H
         KoEn8KAqbCfoA==
Date: Mon, 16 May 2022 11:14:35 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Networking <netdev@vger.kernel.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Kishen Maloor <kishen.maloor@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mat Martineau <mathew.j.martineau@linux.intel.com>,
        Paolo Abeni <pabeni@redhat.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20220516111435.72f35dca@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/mptcp/pm.c

between commit:

  95d686517884 ("mptcp: fix subflow accounting on close")

from the net tree and commit:

  4d25247d3ae4 ("mptcp: bypass in-kernel PM restrictions for non-kernel PMs")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/mptcp/pm.c
index aa51b100e033,cdc2d79071f8..000000000000
--- a/net/mptcp/pm.c