From patchwork Mon May 16 01:19:18 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: 12850196
X-Patchwork-Delegate: kuba@kernel.org
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 20A97C433F5
	for <netdev@archiver.kernel.org>; Mon, 16 May 2022 01:19:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S239040AbiEPBTZ (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Sun, 15 May 2022 21:19:25 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41544 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S236470AbiEPBTX (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sun, 15 May 2022 21:19:23 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 363F72E9EC;
        Sun, 15 May 2022 18:19:22 -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 4L1hHB6gh5z4xLb;
        Mon, 16 May 2022 11:19:18 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1652663960;
        bh=YerwPDpR6NiGitLx1rHAaKW6WOaVHQI2JQUt6Kc7awE=;
        h=Date:From:To:Cc:Subject:From;
        b=sO/buOP2+lmZQdCPJqktK+zxNbcIOHit47Yov6le0nWJbIhBr3QWZNvcZT3roCQ6r
         XoliTlx8XBs6z7t28/CtO3JeFfEj9iNajwUQl99lWOVZ9pmka3er6QmEkfp49jdS74
         Jo/TOcsVj3xEaHEU1XOJtGrlWNH3FWXBimSVJzLRG9CA7qmry89bjSK9h/vVcS6TBE
         WR5t8hiKEHYYhm3ahuZ3PyoydigGmBGAEmZXT6FT1sqaVOnqMHBMoY5g7Fy6MaR2WF
         Ib/VBksG1HuxpqHpRDyTlMOzCiPxIgpfkYn0+Dv3ZrzOyGx1KEWWZCGXLj8Io2JtzK
         OrQ4LETRyWjYA==
Date: Mon, 16 May 2022 11:19:18 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Networking <netdev@vger.kernel.org>,
        Geliang Tang <geliang.tang@suse.com>,
        Jakub Kicinski <kuba@kernel.org>,
        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>,
        Matthieu Baerts <matthieu.baerts@tessares.net>,
        Paolo Abeni <pabeni@redhat.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20220516111918.366d747f@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:

  tools/testing/selftests/net/mptcp/mptcp_join.sh

between commit:

  e274f7154008 ("selftests: mptcp: add subflow limits test-cases")

from the net tree and commits:

  b6e074e171bc ("selftests: mptcp: add infinite map testcase")
  5ac1d2d63451 ("selftests: mptcp: Add tests for userspace PM type")

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 tools/testing/selftests/net/mptcp/mptcp_join.sh
index 48ef112f42c2,d1de1e7702fb..000000000000
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh