From patchwork Tue Mar 15 05:51:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12781044 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D77EC433F5 for ; Tue, 15 Mar 2022 05:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=yu7SN0o+olrwBBZLyoOWTAbClqUDPFmltWzv1LlkwL4=; b=rCS SgT3Wq5EdOXXC3GbQ+q/5+AND4Za08pNaPRW4eYWLyETeaZMIxSbom6wNb0kpneOlneLWD9ANzVMa r/Oew2f8xWI16mvSm+G4AIRVC0Jn1WBuJ3wEYcVmfqER9PxTPDSJumGznC61SAOjuFwSkcoAngK46 k606LDqAah6K9jFFMpC1iq0VwDxqwBwW3XkEbPWKbUt+Mh1UabGNYq2RaCPTl2pCEdpPDWpiGjDPC ZepSd7T5uFzlmItFnhlNoCq+FaAyvLwyiuLvT2yPNbgyVeInoP+zAtUl7CxqgBxOef5a7FacrS93U AsZdx3zo/eqfeUr6nezJE3EWvFkSoJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nU05t-007ro8-QA; Tue, 15 Mar 2022 05:51:41 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nU05q-007rnl-6v for linux-arm-kernel@lists.infradead.org; Tue, 15 Mar 2022 05:51:39 +0000 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 4KHjFy07k0z4xRB; Tue, 15 Mar 2022 16:51:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647323496; bh=JL3qPG79Sr2Y4eycu712fjbW83NobsBalx/XzRU79Ik=; h=Date:From:To:Cc:Subject:From; b=dCGPANzHpehEHrWcflKcL9tonj5uvFdh3SO76dI5r8sl4xLLq3mgvfSHYztr/hxoe qtWjWRop+1gDVwav2plJJkCju7/Yxg/ZgsRaIexR9bgj6NY3TltP/cm0o7eEdegl/s 6m330WMYjccOYKOrgZuCN8emzs5ut11iQH+2JFCBTVkpd+53ksTAcXlbgTanaIT6rv oEP3lchqCW8Akc1QdBWTGprlMiGggc8A8mFfMrgkpT8TAVjVZ2Bc0yldUrfONuFa1q dA3NoQSMAvFpJy6/oYkwMt4PurXZwatSBRKjFEFzVlcKsf9VP+0jEFUivjChLjBR1T 2cjpPpi+Xj0ww== Date: Tue, 15 Mar 2022 16:51:33 +1100 From: Stephen Rothwell To: Greg KH , Arnd Bergmann , Olof Johansson , ARM Cc: Bjorn Andersson , David Heidelberg , Linux Kernel Mailing List , Linux Next Mailing List , Luca Weiss , Vinod Koul Subject: linux-next: manual merge of the char-misc tree with the arm-soc tree Message-ID: <20220315165133.5b720984@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_225138_453422_3874500C X-CRM114-Status: GOOD ( 19.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the char-misc tree got a conflict in: Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt between commit: c04421c68fd4 ("dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible") from the arm-soc tree and commit: e7393b60a14f ("dt-bindings: phy: convert Qualcomm USB HS phy to yaml") from the char-misc tree. I fixed it up (I removed the file and added the following patch) 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. From: Stephen Rothwell Date: Tue, 15 Mar 2022 16:48:51 +1100 Subject: [PATCH] fixup for "dt-bindings: phy: convert Qualcomm USB HS phy to yaml" Signed-off-by: Stephen Rothwell --- Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml index a60386bd19b2..e23e5590eaa3 100644 --- a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml @@ -38,6 +38,7 @@ properties: items: - enum: - qcom,usb-hs-phy-apq8064 + - qcom,usb-hs-phy-msm8226 - qcom,usb-hs-phy-msm8916 - qcom,usb-hs-phy-msm8974 - const: qcom,usb-hs-phy