From patchwork Wed Oct 4 02:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 148129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2468084vqb; Tue, 3 Oct 2023 19:00:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELsbieFGWyW51/O0waPfVmJQ5jKWbotS3sf2CnD0bow2iPsEEo3e2CCHPMIM8zfkgyQ0CC X-Received: by 2002:a9d:63d9:0:b0:6bc:e049:b28f with SMTP id e25-20020a9d63d9000000b006bce049b28fmr959294otl.34.1696384858768; Tue, 03 Oct 2023 19:00:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696384858; cv=none; d=google.com; s=arc-20160816; b=qjC4gl5y2G5dBIVpf69KpAHpl5vjZuCrNC4hhdPKVnGlLcaeOy7je6FfPigPJc5cZK Ar/9v54W+wLhFIxzLr4k5LmWwnUSFInpyI88fa3EsrPLRTJ3jH80mXA3hwxKVWirDD09 AOFkPd2o9UIMBz1fQiF2qgEvvcNPnqOZq2aHEOMoBf8MxX1nPWgzhGamWvJAKgT7O/yP D9XggWXLF/q+1rogMIZv16lSCmtt7QEEa9oruhFvoOfhXFZatj59/ExPJixTtON9UUbM 9r7FQPRTXV6xx+JHjsGRSaQdZuiLHjB7R5587LeDb8nO62bcwTeLXP022v0wJVY9cBJz nCcg== 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=OYwuO+L2Qg7Tzeggc39l+CyC2BYsYQ2kidiuBqWOV8Q=; fh=Pg52Qt3K9cT5BjofRhKVlYbk55hRTs6x0zeP06Xh2PA=; b=vWp/aLBV19L5FSLQpy6fHhWXiBRFEH+p/mttVP2fnuBB1DWyIM4rGXOEg+JJAnYsnw 5+c7t053Z7xDgr8MElIfvci1ygLpqdi/A2KTN+xkO2qizjgQ4x5gT7oZavQ2RJICT4N/ 5RzvCYfAfHRr6Ig+W/IktrXN28Zk2t6q7m5UqdgndaT8/XI6hNaV+OAt55woo82Da6up Bp1PWCsc/NhRLmF0OtZbPNWA32mpM9eGvgimWAIvepPDHATwppgTiKFXG+2LhTQW6I40 KwRubvxIeCctyoH9OO8wQf449q9H777G2k1I6VLpnRVs5NQEiFvTBbE1WFG08GwMs0h5 ld+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=sVozHDIm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id a24-20020a63cd58000000b005859dcf3c4dsi2800071pgj.92.2023.10.03.19.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 19:00:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=sVozHDIm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id E236D8026D8D; Tue, 3 Oct 2023 19:00:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240553AbjJDCAl (ORCPT + 17 others); Tue, 3 Oct 2023 22:00:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230274AbjJDCAk (ORCPT ); Tue, 3 Oct 2023 22:00:40 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25080A7; Tue, 3 Oct 2023 19:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696384835; bh=OYwuO+L2Qg7Tzeggc39l+CyC2BYsYQ2kidiuBqWOV8Q=; h=Date:From:To:Cc:Subject:From; b=sVozHDImVZuon2+wdzT2jfr6p2eOywX3H/CZr8YiH4IsWYhY/ZI8jwlWi7G+fNVxt lJEfiessyjfMjCrlQyuDyiqtz9AC4IhgMPob5/3G25bT2fsRIqPFZ/DlPzjPq8V/dj UQmOiSdkWKKDtNx+nvj2L9KV169bW3bMR3+YVT2u6azorLX6nFPuI1ic4JOlvvUw41 sPJ7AQUmKUSJPc+q8TFd6B/eds/CDr/VyJxJZrT5S+bAyq1asuAHh2eoo6LGl5VIHR ZPqD3nN1i79GxYpBP5K8q7p7LctATO1uszFUlWQeq1lsoUVPZW45GIvUv9+3w1OMuF SYbU43ltry5kQ== 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 4S0dFH0ptjz4xQX; Wed, 4 Oct 2023 13:00:35 +1100 (AEDT) Date: Wed, 4 Oct 2023 13:00:34 +1100 From: Stephen Rothwell To: Kishon Vijay Abraham I , Vinod Koul , Greg KH Cc: Dmitry Baryshkov , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Rohit Agarwal Subject: linux-next: manual merge of the phy-next tree with the usb tree Message-ID: <20231004130034.7b1c5b89@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 19:00:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778788449838185900 X-GMAIL-MSGID: 1778788449838185900 Hi all, Today's linux-next merge of the phy-next tree got a conflict in: Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml between commit: df55d4f814f9 ("dt-bindings: phy: qcom,qmp-usb: Add SDX75 USB3 PHY") from the usb tree and commit: 15c83637402c ("dt-bindings: phy: migrate QMP USB PHY bindings to qcom,sc8280xp-qmp-usb3-uni-phy.yaml") from the phy-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 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml index d58dd744d5d2,bbdb28cd8029..000000000000 --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml