From patchwork Wed Jun 14 01:17:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13279365 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5FE57F for ; Wed, 14 Jun 2023 01:17:58 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4576195; Tue, 13 Jun 2023 18:17:56 -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 4Qgnbk0V6Nz4x3k; Wed, 14 Jun 2023 11:17:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686705475; bh=J9toyfhL4eKZ2nOiRZ1A5QhRm5TKOvzbGRDzh58r3Ks=; h=Date:From:To:Cc:Subject:From; b=lMN1CmnT2Q6v7a0fcOJuc17JJpUuLOlZ61Nn0PuE2KDXwtm5UQCd4l1KNhtwIne+v bKhzf+tS9vA62DoS0TGwGnhoet4zHONycfH/3BbJBuBeLm7Q5RAjKAvQlyl1F5wRHo YrTCbP0cJLIjbJ3wPdGmXuB6++MCOQPpjkdGCwCH3ud+YtS26hr6YJTU+be8tcJUX+ 7fACxHpgF0f55HAAXSZIx1Eh1h4XVD/Vx3G30EpmP93SEX1h0ilW2Qb6uyl4tPS7J3 qg24grpkVQCcv/ld5t1opVx5AcLDQQJMW0XplJCKtx+Ex4YsLHSO8YbOD5j72YuY/k /1jJPf2JPGPZg== Date: Wed, 14 Jun 2023 11:17:52 +1000 From: Stephen Rothwell To: David Miller Cc: Networking , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , Mat Martineau , Matthieu Baerts , Paolo Abeni Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20230614111752.74207e28@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 commits: 47867f0a7e83 ("selftests: mptcp: join: skip check if MIB counter not supported") 425ba803124b ("selftests: mptcp: join: support RM_ADDR for used endpoints or not") from the net tree and commits: 45b1a1227a7a ("mptcp: introduces more address related mibs") 0639fa230a21 ("selftests: mptcp: add explicit check for new mibs") from the net-next tree. I fixed it up (I think - 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 0ae8cafde439,85474e029784..000000000000 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh