From patchwork Mon Jul 31 00:22:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 128318 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1757483vqg; Sun, 30 Jul 2023 19:25:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlEUNU7ma/NGhL3I3fIpfa7BGYf/T1vqg6s9JSA25bjDnuoPjSUID/MAiYo5Lgxj+TEi6kCd X-Received: by 2002:a17:906:6a06:b0:99c:10b5:7650 with SMTP id qw6-20020a1709066a0600b0099c10b57650mr2501729ejc.1.1690770349990; Sun, 30 Jul 2023 19:25:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690770349; cv=none; d=google.com; s=arc-20160816; b=QmgXSTaVAxqZ+tEJABoajDVc9FyTG0ycfosGWuMYGq/sQDJFS6KJ+g5ZnYiphHBW6d ZnvhU/D8oxobsGmqwQsox3oc5JdG09Sghby7sBf9NSqB+VezoO4RvjR34cxEt2DguHwI BjNakorhqAaUTg0ShASiJluDJlq04KkYh4IQdp5hJ3RzhDoYfhFWC6KTq4tUV5mB90pY rJWJcf7nPBA8id+HTXAwImtZE7SKUzvJa9htvb8mEIf43yGnqTxkIqJb08x71ljaGB4k YNQ71XUDGnjVBmgOWEMAa3c/UzyvZhCDadpw2RLTRCNAlp7uBG6UtgmSpPkwIYcj5V3r u8aw== 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=JlyC7xX6YRAjfY+BJvIeslbDpyrbJNzV0Pn7JECl8ng=; fh=TDBJGjO1sbpLd8UnUOp1ymnGeh+Lw54jevWno//U1GE=; b=K8a2OnopsM4xFtJNiYkediM8ux7zuGyDgZxVGgXiNm+fX7FXzSQ7iHXd1rQDgX8d6a WXuKohLco7sreP16gGkkLfGoaqIXFN0sEKiJ7J/c9pFQDwSHR8n/V6mFJ04O/qRv31fb fXNXTJoQyjfjwFntF/3/TeTHfUAdY0eLm5dW4jkZ4zSdbfLJUj+o18nlc28gaDy0sVrV YNFdB3qxGGyfGS9w45fr4YvJsMdp/idHddGs2Jwfc69C+CcHyV//yw68A+rmMKTi/CBn 46fN9i2XCY0iYsSts4Qn6F5WN05ZpIfOIVBx1TMHJZ8MMy/Numhsh8LxbDK4QlyMI6FL J08w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=b2lIF1a8; 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 y12-20020a17090614cc00b0099b4222f51fsi2799430ejc.266.2023.07.30.19.25.24; Sun, 30 Jul 2023 19:25:49 -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=b2lIF1a8; 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 S229639AbjGaAXB (ORCPT + 99 others); Sun, 30 Jul 2023 20:23:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjGaAXA (ORCPT ); Sun, 30 Jul 2023 20:23:00 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19B70A1; Sun, 30 Jul 2023 17:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690762976; bh=JlyC7xX6YRAjfY+BJvIeslbDpyrbJNzV0Pn7JECl8ng=; h=Date:From:To:Cc:Subject:From; b=b2lIF1a88q+4khD02Wv2RV+HkJqsoDUitLGqUN3xbzu1A8jwDBXFRyi2YeHnEhE4v 3kS75Zyrs6jJXZplyaMCgsjnOGQ5KEUAVngdC4VP3G7GzZhEazPRI1kL4OQsTNmPg1 QhqK+GdQ6MPdKL8ewvPVkhPfLtqtOCmMLDSziMlI/TJQA3HxwWUc7sl9NLvM4GdA26 4gNR9phasaya/HoDzGFcpMuLeTybLPWlzXhxmKdFMASqibQhFSbLPZBThkD2BYqmN4 ORRk8XBGoricEShve+ISpAKjNUUoeFHhmqhloBGODSQFQz+AVdkYKiNYJ1T2nYgFgM jQzJXarIThnNw== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RDf8b4lD1z4wbv; Mon, 31 Jul 2023 10:22:55 +1000 (AEST) Date: Mon, 31 Jul 2023 10:22:54 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Linux Kernel Mailing List , Linux Next Mailing List , "Russell King (Oracle)" Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20230731102254.2c9868ca@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 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: INBOX X-GMAIL-THRID: 1772895956269911284 X-GMAIL-MSGID: 1772901210234554726 Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/dsa/port.c between commit: 9945c1fb03a3 ("net: dsa: fix older DSA drivers using phylink") from the net tree and commit: a88dd7538461 ("net: dsa: remove legacy_pre_march2020 detection") 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/dsa/port.c index 2f6195d7b741,c63cbfbe6489..000000000000 --- a/net/dsa/port.c