From patchwork Mon Jun 19 00:54:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 109700 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2710769vqr; Sun, 18 Jun 2023 18:02:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79W5wXvuGk6NpJwhg99UlV/RtL2U4TygU2WK/QcnHXozh95RSaUxBuWahOdymWgb6Cj2Qf X-Received: by 2002:a05:620a:2b84:b0:762:12f:17d2 with SMTP id dz4-20020a05620a2b8400b00762012f17d2mr8808472qkb.71.1687136543751; Sun, 18 Jun 2023 18:02:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687136543; cv=none; d=google.com; s=arc-20160816; b=fMGKIYunQ/LcN03dIAR86QafrXddScylTHdyRiTbVE2MeUxiql5EE0ahgmBsWiaCYu U5xQaJYfPcZ/gk/Ik3ORoQWFUWKCymqEz9+YMCPKonplEpaX7LFChoA7RW3bU9y5byly IvBVHclCJRMSpE8XWLAA/u79Kpa1s81jTBJHGmzx47DOADu19ps7OU7aBnuidkkrqifw BMVFBoTzYZpoO5NKEG6o1f3XBHE0cuhUwCht5ntOBvo+6O1I4ioi+cqMiMUivopx154W xK5NUdlCtk7qFeAevDfS+RIhXhorZeWo8a8RGWnCPQyKJ8QVzB/83a7bxB25ySV1E6fG 6F+Q== 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=UGzDDf6+2/OAPf09/wxh38XnQsJqOh/a9BOPRdmOeVQ=; b=iaPtQCBbDzjbxSklzwpZ7GNPGWwHrdMQ/1xE2oGlx4OM4wpJP2J9xHWuIXAcc8lX95 c7RaUty5uZX6fN3CiqQTjUvZJrAe74T4t8NGAXq6lPuJiAEmZp8Y7fBgLPFzjn7ev9DS FTnL/HgAR3EyxKQ5ejuEfC2s7ShDYokd7cHFNtppMHB8xCkmjJKxwkHbtiwUJmOUefQP AgQBuAQOoEzIXcsB8BrAcaQbS8gWzsPxEETL85e09kI+kNW6mJV7iqynQLG3fqvKehRL T9ddbex67S8/VkkCObuN0OKeRBVIYciIx1ZQUOyEWAt+fUnxvoZS/fbJGJvKIIze02Tz ooIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=JJ9IgFgr; 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 l13-20020a170902f68d00b001ae5e5c275asi7577308plg.364.2023.06.18.18.02.11; Sun, 18 Jun 2023 18:02:23 -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=JJ9IgFgr; 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 S229529AbjFSAyj (ORCPT + 99 others); Sun, 18 Jun 2023 20:54:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjFSAyi (ORCPT ); Sun, 18 Jun 2023 20:54:38 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C7C7199; Sun, 18 Jun 2023 17:54:35 -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 4QkrrP47JKz4wgC; Mon, 19 Jun 2023 10:54:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687136070; bh=UGzDDf6+2/OAPf09/wxh38XnQsJqOh/a9BOPRdmOeVQ=; h=Date:From:To:Cc:Subject:From; b=JJ9IgFgrqRdWyPHeiLzWx9in/kR7/UtwtodhP+T+XwdBMjTlFPNe3u5n8qus8kPZo VRmcZFtdFScQPG9pUy9RnjD6qsIxCJyl5cfZ7uE0PnQJGBDHx1lrDaQ8v+JtvjIscY WqI+zlFfxE2zUAE64hQsVjyvpNMSE1YMY+h2Ub44voZTzCTQ6kUYVCVdgAZmz2aJCs Trvy5Hgokl4Yr6tQI/cyypXEo9yUVNg4rJM1OmxUDI3n3q+DTGck8jTntMAwMh33+s prfFbRJkTQiRyfYLtDMsIMuWOC8zWJWSeJwXAoMydel//Yb7XORos8/g92QMsgjZYz M7n6AQfdZ8bJg== Date: Mon, 19 Jun 2023 10:54:27 +1000 From: Stephen Rothwell To: David Miller Cc: Networking , Guillaume Nault , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , Magali Lemes Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20230619105427.4a0df9b3@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769090888306590872?= X-GMAIL-MSGID: =?utf-8?q?1769090888306590872?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: tools/testing/selftests/net/fcnal-test.sh between commit: d7a2fc1437f7 ("selftests: net: fcnal-test: check if FIPS mode is enabled") from the net tree and commit: dd017c72dde6 ("selftests: fcnal: Test SO_DONTROUTE on TCP sockets.") 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/fcnal-test.sh index ee6880ac3e5e,05b5c4af7a08..000000000000 --- a/tools/testing/selftests/net/fcnal-test.sh