From patchwork Wed Apr 19 14:13:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 85425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp423994vqo; Wed, 19 Apr 2023 07:15:25 -0700 (PDT) X-Google-Smtp-Source: AKy350bG0kg3rYuWuZg9rpM2z84dqrgeGBUUnQJSxoALQQpeFX849po61pD23RbxjiHfpIPRjGw5 X-Received: by 2002:a17:902:da8e:b0:1a5:1109:f58e with SMTP id j14-20020a170902da8e00b001a51109f58emr3024217plx.29.1681913725365; Wed, 19 Apr 2023 07:15:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681913725; cv=none; d=google.com; s=arc-20160816; b=QKYyIvLHpUTRV53ZFUESzG6xS1y1FzCkKQcYrGr+DSE7v/oc6cUAresPK/vegcSK4n Q17PB8xpDVy0bkzVlxB7NrGenpwsagFHzNGIox/S2V8Bxmvf3sIPBJu5K7atOyIzFubk gNw79DgRgB11YrzHL6zaP+qpMIVd6EQX67QNMs+ERuVZssXtmjJ2ikVT2WDrGtCI29zn B9xo0I/s1B4hUkSQNsjpiJIkrpKmuzZpZq6eRwXJesBut8Rl27do5JEfkEMeFpNmHeRB ubRE07shaZIzDey5KYrueNgOCuCARXFU11XFn+8kqkGWneKvgZUc52f2OpBylCCvuCUp 0uRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=D1ipkqKuoSlwIjLXmY9Ck7sUk2vEM3xGtrkT9eeWzQk=; b=hurZSVS+qWElIxmJ9WQ9M89uOCjT2Y7nOom2xFnB2qc+4rQZ8KVDDMZuoMrm4S7m7f Do3G5wFf1PkbcX5iIf/s6U4IzA5gFHJpD9DvWQ73Ln65+3vjE1FJJogH3Bm6NZ/eHE6J aMw0Nhq2H4mnQXdSZ4ApHjru5FWnpYLvGSDtcMvOZoI+8Ulw3bRRTtWtnH4YBWwAO3t7 3f9tJ0BPBzoF04mxW9GgPFr1AEIb7v0XHBGige5DwEWhmSMppjT+6tf5Glc81/31dwey JvqaBTRBdl6qfhwjC8UzisqjlIGzc/PGRI3q3Kke0A5XwgeeF2MOsngRtezwi0VQgN/Y wd0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IDY7onV1; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n12-20020a170902e54c00b001a6f91439d8si5317597plf.393.2023.04.19.07.15.09; Wed, 19 Apr 2023 07:15:25 -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=@kernel.org header.s=k20201202 header.b=IDY7onV1; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232931AbjDSOOa (ORCPT + 99 others); Wed, 19 Apr 2023 10:14:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232666AbjDSOOO (ORCPT ); Wed, 19 Apr 2023 10:14:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB4631791D; Wed, 19 Apr 2023 07:13:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 41AF060C12; Wed, 19 Apr 2023 14:13:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10608C433D2; Wed, 19 Apr 2023 14:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681913602; bh=+p00QP5/h9exgjfULX2JyvDzcIbvbzctcsjVv6xlmMc=; h=From:To:Cc:Subject:Date:From; b=IDY7onV1awLB/okgBqSnektZLne3XQ4x/E4ZrV3XasMFc2g9d5izJ8sT+LAiTDv1/ +3QW7++ST1o7gNglup2lP5uG22naWQOuGmLqshOVVMGtkSdDRVyq72DcJX8+PlOoDk GZ5SakFMlZPYugu47gi7OLPjG3JkD398W1ysmGXd03xWdiBYKNeowKhu2xo/ISSmyC oYIEVVZV+xDnfqAQYn3KGFcwThuMf/8uVTyKxeJpoNd6vcuEpJp5jjgkEewNwyz+N+ wBUhMfB/5CZJkb1zO4LkuW7MRhEKlGh/10MpoRiLXrUGLEoGxhxFdYDq5zjBd3WMXO fatyMHXbsHkgQ== From: broonie@kernel.org To: David Miller , Networking Cc: Conor Dooley , Emil Renner Berthing , Hal Feng , Linux Kernel Mailing List , Linux Next Mailing List , Paolo Abeni , Samin Guo , Yanhong Wang Subject: linux-next: manual merge of the net-next tree with the clk tree Date: Wed, 19 Apr 2023 15:13:14 +0100 Message-Id: <20230419141314.76640-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,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?1763614366482160615?= X-GMAIL-MSGID: =?utf-8?q?1763614366482160615?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: MAINTAINERS between commit: 63a30e1f44d5e ("MAINTAINERS: generalise StarFive clk/reset entries") from the clk tree and commit: b76eaf7d7ede3 ("dt-bindings: net: Add support StarFive dwmac") 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. +++ b/MAINTAINERS @@@ -19911,6 -19928,20 +19937,13 @@@ M: Emil Renner Berthing + M: Samin Guo + S: Maintained + F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml + F: drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c + -STARFIVE JH7100 CLOCK DRIVERS -M: Emil Renner Berthing -S: Maintained -F: Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml -F: drivers/clk/starfive/clk-starfive-jh7100* -F: include/dt-bindings/clock/starfive-jh7100*.h - STARFIVE JH7110 MMC/SD/SDIO DRIVER M: William Qiu S: Supported diff --cc MAINTAINERS index 8c77a6a3f2c56,4fc57dfd5fd0a..0000000000000 --- a/MAINTAINERS