From patchwork Thu May 25 01:00:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 98732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp36580vqr; Wed, 24 May 2023 18:21:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6lW6Z6HlENg2JEMJuWZLioBmFy/0tvXgOteU/qF46iOQ3nfPSLpP4r6hCA39jJ+ZuRkzf1 X-Received: by 2002:a05:6a20:c89b:b0:f2:57da:7f45 with SMTP id hb27-20020a056a20c89b00b000f257da7f45mr22419817pzb.8.1684977698911; Wed, 24 May 2023 18:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684977698; cv=none; d=google.com; s=arc-20160816; b=LYmTTmMs9ubl8Nlq0tOpQDYQZ8cCZ+F5yBH2WiMqjIF3nXhq+ZkuFQYMS7GIoOxU4p sMHcCjlGWirSMbm0JAqQnHfjgLrSFvfpPZ+XWyx3sXoY2FTtDlSnG4wtzvErLjNiFL3D cM5QM+q7ECa95IUncpd7aoHKVR5N2JO2DbkhM0nslCU8xGAJ9cHsi/CcjqMCjfLtRTRF eli0rpVS9NfSZH7DRGn7Rd/NVPMFa4ZAT+22BhRG3LUIvhit0Lv0vXO3MdVqmD4H8OkO tk0hL3V06d7tjeAWJxns/m7aSCGlq97/aVkwONkoo9r6bdxmRFEIp1fv5o7JLntIsQfm HAcA== 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=OufjmZqKC0zG8gRNOtyYpkGGKrvvZktgoTrkVOag6VM=; b=nayTKgNzwDYf7UBcTvpTmeYv+HnmuDYvRRskm0gaQG97YG3FbOKkTvY44LXcT5uu35 X5aHF0LsRWAGQ7H0rZ0jlv6WPrAID32HHllhuEnrbtZ9KnhU0UtUJppBKEte+ztt57Kw yNN1B2UqgABREE6UT0YfzpPSHH+fXrMH5501JkcOtGVWSHzOMt3LTEnl7ZJzXj61fTMl A19ZIrgy2ldZIvWFp9SayUCxKdrcCr5JDujyEwU236jXFfuSIMjH2h5W4xhfIdkKtENU E9OX4mzK0wI8B0c6kh7rLYX+QXb6BZoT1IB8I5ZZfcgLaJXsZZ/datowc8fRRL22cEyI b3tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PWt28mWY; 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 mm14-20020a17090b358e00b0023418ec51f8si2386655pjb.136.2023.05.24.18.21.26; Wed, 24 May 2023 18:21:38 -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=PWt28mWY; 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 S234798AbjEYBAo (ORCPT + 99 others); Wed, 24 May 2023 21:00:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbjEYBAn (ORCPT ); Wed, 24 May 2023 21:00:43 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54878F5; Wed, 24 May 2023 18:00:41 -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 4QRV930clCz4x1R; Thu, 25 May 2023 11:00:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1684976439; bh=OufjmZqKC0zG8gRNOtyYpkGGKrvvZktgoTrkVOag6VM=; h=Date:From:To:Cc:Subject:From; b=PWt28mWYxRb9OS6XkJcRjYVGJO1XwEwoGlPlKn2XryvJ7CBI1OgwrErE1P0pVHE+e kW610NVrSzb10A9ukGujrltba4wR+j8vAeY7YT6fiwUlOxW2EQwmKeC2I9QsueEDJ7 NAzwz1kHJbDQWlxRwUoSIfJG+RbPXqLkeFA1Mxb1MBFY4u1LTwPRqxzmpftHxhqH67 cACNSjONthVhnaiFD7S+hCW+4bbUcQE9Qv0mE1OvxTa3qk21/ot2Ly6s+s/UrVyVC2 iKSbJMXdP2xwuE3DYZuwdDEA2a/5+o7I+b25go/lf9aYjk7wM63uHmecXkqsNR4Xsq Y0N+APTGF2tvA== Date: Thu, 25 May 2023 11:00:37 +1000 From: Stephen Rothwell To: David Miller Cc: Networking , Guillaume Nault , Linux Kernel Mailing List , Linux Next Mailing List , Nicolas Dichtel , Paolo Abeni , Jakub Kicinski Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20230525110037.2b532b83@canb.auug.org.au> 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 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?1766827175880287356?= X-GMAIL-MSGID: =?utf-8?q?1766827175880287356?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/raw.c between commit: 3632679d9e4f ("ipv{4,6}/raw: fix output xfrm lookup wrt protocol") from the net tree and commit: c85be08fc4fa ("raw: Stop using RTO_ONLINK.") 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/ipv4/raw.c index eadf1c9ef7e4,8b7b5c842bdd..000000000000 --- a/net/ipv4/raw.c