Message ID | 20230614111752.74207e28@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp933749vqr; Tue, 13 Jun 2023 18:32:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5iZ2kdci1/B5pHxR6nao5gt1lqvbnuABywMS2Dz3D49GO6NKwvz7o0sdMYpzDIH0CO7HzA X-Received: by 2002:a17:907:3f8e:b0:967:2abb:2cec with SMTP id hr14-20020a1709073f8e00b009672abb2cecmr15118782ejc.64.1686706367962; Tue, 13 Jun 2023 18:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686706367; cv=none; d=google.com; s=arc-20160816; b=GGInEjOUMLSeIuA1KSkWejX2nZJQ/eYJ122/UK5IEOqvvEDoTacOQD/L/n/cCabWVj rTQe7TFZIVchR4ZfT/+JnOqJp2CsVjVfornoDCTLm0axhO6Hftf2sUIAQdSUPihD2RZt kOmUpRE28rvPh8hcyeyTPxyv0HLMTLV8BaTX7MlFFPPwrOw5ycHBFmbpoQbV9NC5zUi0 R66MovkV6HZ5zbllkOO2aZP3MtRaJhaGUOwgi4LPAr1xUwZl4esca4aoWXkwA+WK6qnn YaisQQJ5Vjg4YKgbczvTh0Rga+nJKocY1r5AucQavAQICJMjQpfY+S6eUAvST9vRtjzQ mPSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=J9toyfhL4eKZ2nOiRZ1A5QhRm5TKOvzbGRDzh58r3Ks=; b=DUrionW5rP7Qh/eXRN2RedIi9pgdjJklYSGSt/3iPy4aWgc5hbGUzx/+YZxSaKK7Aw +om4vSN65H8n9eUVuQAX98tG+iJTgHjad1NaZ+6bLx1AOkgU2p5iiFNPQ4UY3rF2bV3I 3exzIfVGzOCRmvzFUK63F+Y5wp+WlcZGJjoYrJGMNAieOl/lV8yGajc+oDaiMGqfpEch xQJaTJVEnNrb3JkzEuuuNKJoEw4+kahEGRnluSTBMN5wp6c5wfvjucJ9OyqXy5fnZMRi L1TXjgLLt1GJn4SZUvPK97XOM3Fri6IR9/6l405pdwBBGwwuEUKOfUqGmiDZt6f3BaNc Ad5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lMN1CmnT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ci6-20020a170906c34600b00973b8e7c324si7566138ejb.613.2023.06.13.18.32.21; Tue, 13 Jun 2023 18:32:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lMN1CmnT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241901AbjFNBSA (ORCPT <rfc822;lekhanya01809@gmail.com> + 99 others); Tue, 13 Jun 2023 21:18:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231970AbjFNBR6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 13 Jun 2023 21:17:58 -0400 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 <sfr@canb.auug.org.au> To: David Miller <davem@davemloft.net> Cc: Networking <netdev@vger.kernel.org>, 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 <martineau@kernel.org>, 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: <20230614111752.74207e28@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Q/YHspEDIqA.3mwSfqLZWxX"; protocol="application/pgp-signature"; micalg=pgp-sha256 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 Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768639816326982571?= X-GMAIL-MSGID: =?utf-8?q?1768639816326982571?= |
Series |
linux-next: manual merge of the net-next tree with the net tree
|
|
Commit Message
Stephen Rothwell
June 14, 2023, 1:17 a.m. UTC
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.
Comments
Hi Stephen, On 14/06/2023 03:17, Stephen Rothwell wrote: > 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. Thank you for the conflicts resolution. If I'm not mistaken, it looks good except the last chunk where the new call to chk_rm_tx_nr() should go inside the 'if' statement. So instead of this bit you have on your side: > @@@ -2394,12 -2290,8 +2399,13 @@@ remove_tests( > pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow > run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow > chk_join_nr 3 3 3 > + chk_rm_tx_nr 0 > - chk_rm_nr 0 3 simult > + > + if mptcp_lib_kversion_ge 5.18; then > + chk_rm_nr 0 3 simult > + else > + chk_rm_nr 3 3 > + fi > fi > > # addresses flush We should have: > @@@ -2394,12 -2290,8 +2399,13 @@@ remove_tests( > pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow > run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow > chk_join_nr 3 3 3 > - chk_rm_tx_nr 0 > - chk_rm_nr 0 3 simult > + > + if mptcp_lib_kversion_ge 5.18; then > ++ chk_rm_tx_nr 0 > + chk_rm_nr 0 3 simult > + else > + chk_rm_nr 3 3 > + fi > fi > > # addresses flush ("chk_rm_tx_nr 0" needs to be inside the 'if') I added a note about the conflicts on the cover-letter: https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/ Maybe it was not a good place? I didn't know where to put it as there were multiple patches that were conflicting with each others even if the major conflicts were between 47867f0a7e83 ("selftests: mptcp: join: skip check if MIB counter not supported") and 0639fa230a21 ("selftests: mptcp: add explicit check for new mibs"). I guess next time I should add a comment referring to the cover-letter in the patches creating conflicts. Cheers, Matt
Hi Matthieu, On Wed, 14 Jun 2023 10:51:16 +0200 Matthieu Baerts <matthieu.baerts@tessares.net> wrote: > > Thank you for the conflicts resolution. If I'm not mistaken, it looks > good except the last chunk where the new call to chk_rm_tx_nr() should > go inside the 'if' statement. So instead of this bit you have on your side: Thanks for checking this. I will amend my resolution in linux-next from tomorrow.
On Wed, 14 Jun 2023 10:51:16 +0200 Matthieu Baerts wrote: > I added a note about the conflicts on the cover-letter: > > https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/ > > Maybe it was not a good place? I didn't know where to put it as there > were multiple patches that were conflicting with each others even if the > major conflicts were between 47867f0a7e83 ("selftests: mptcp: join: skip > check if MIB counter not supported") and 0639fa230a21 ("selftests: > mptcp: add explicit check for new mibs"). I guess next time I should add > a comment referring to the cover-letter in the patches creating conflicts. Hm, yeah, I think the cover letter may not be the best way. Looks like Stephen didn't use it, anyway, and it confused patchwork. No better idea where to put it tho :( Maybe a link to a git rerere resolution uploaded somewhere we can wget from easily?
Hi Jakub, On 14/06/2023 19:41, Jakub Kicinski wrote: > On Wed, 14 Jun 2023 10:51:16 +0200 Matthieu Baerts wrote: >> I added a note about the conflicts on the cover-letter: >> >> https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/ >> >> Maybe it was not a good place? I didn't know where to put it as there >> were multiple patches that were conflicting with each others even if the >> major conflicts were between 47867f0a7e83 ("selftests: mptcp: join: skip >> check if MIB counter not supported") and 0639fa230a21 ("selftests: >> mptcp: add explicit check for new mibs"). I guess next time I should add >> a comment referring to the cover-letter in the patches creating conflicts. > > Hm, yeah, I think the cover letter may not be the best way. > Looks like Stephen didn't use it, anyway, and it confused patchwork. > No better idea where to put it tho :( > > Maybe a link to a git rerere resolution uploaded somewhere we can wget > from easily? Good idea, I didn't think about git rerere! I will try to remember about that next time :) Cheers, Matt
diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh index 0ae8cafde439,85474e029784..000000000000 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh