From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81AFFC5479D for ; Wed, 11 Jan 2023 09:11:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238431AbjAKJLS (ORCPT ); Wed, 11 Jan 2023 04:11:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238443AbjAKJKu (ORCPT ); Wed, 11 Jan 2023 04:10:50 -0500 Received: from relay05.th.seeweb.it (relay05.th.seeweb.it [IPv6:2001:4b7a:2000:18::166]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A178313F3C for ; Wed, 11 Jan 2023 01:07:36 -0800 (PST) Received: from SoMainline.org (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r2.th.seeweb.it (Postfix) with ESMTPSA id CCC473EE6C; Wed, 11 Jan 2023 10:07:33 +0100 (CET) Date: Wed, 11 Jan 2023 10:07:32 +0100 From: Marijn Suijten To: Bjorn Andersson Cc: Krzysztof Kozlowski , Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] dt-bindings: arm: qcom: add board-id/msm-id for MSM8956, SDM636 and SM4250 Message-ID: <20230111090732.4rdkp74cuwytolay@SoMainline.org> References: <20221214150605.173346-1-krzysztof.kozlowski@linaro.org> <20221214152915.wshz4odyqcupo6xw@SoMainline.org> <65ccd0c9-8bd9-fc3c-ef33-78b905adf294@linaro.org> <20230111043000.6svnos6u4ynwxjgv@builder.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230111043000.6svnos6u4ynwxjgv@builder.lan> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023-01-10 22:30:00, Bjorn Andersson wrote: > On Wed, Dec 14, 2022 at 05:45:49PM +0100, Krzysztof Kozlowski wrote: > > On 14/12/2022 16:29, Marijn Suijten wrote: > > > On 2022-12-14 16:06:05, Krzysztof Kozlowski wrote: > > >> Allow qcom,board-id and qcom,msm-id leagcy properties on these older > > >> platforms: MSM8956, SDM636 and SM4250. Also mention more OnePlus > > >> devices using modified qcom,board-id field. > > >> > > >> Signed-off-by: Krzysztof Kozlowski > > > > > > Reviewed-by: Marijn Suijten > > > > > >> --- > > >> Documentation/devicetree/bindings/arm/qcom.yaml | 5 +++++ > > >> 1 file changed, 5 insertions(+) > > >> > > >> diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml > > >> index d45e2129fce3..cfb7f5caf606 100644 > > >> --- a/Documentation/devicetree/bindings/arm/qcom.yaml > > >> +++ b/Documentation/devicetree/bindings/arm/qcom.yaml > > >> @@ -925,15 +925,18 @@ allOf: > > >> - qcom,apq8026 > > >> - qcom,apq8094 > > >> - qcom,apq8096 > > >> + - qcom,msm8956 > > > > > > I am certain this (and msm8976) were added in [1] but it somehow got > > > lost when that was merged as 05c0c38dc752 ("dt-bindings: arm: qcom: > > > Document msm8956 and msm8976 SoC and devices")? > > > > > > Should we also add qcom,msm8976 or only when a user for that board is > > > added? > > > > Bjorn, > > You need to fix your scripts. It's not the first time when applied patch > > is changed and its pieces are gone. > > > > I don't have any script that automagically solves merge conflicts, so if > you prefer to avoid the occasional mistake I can start reject your > patches as soon as they don't apply 100% cleanly. Is this manual conflict resolution by you? Git would/should only make it disappear if it thinks that (part of) the patch has already been applied, though I don't think those lines were added with the exact same indentation elsewhere in the file. There's also a mode that makes git reject the patch if the context (and line numbers?) doesn't match up exactly, but that may cause more harm than good. - Marijn