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 A914DC433F5 for ; Fri, 30 Sep 2022 16:28:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231648AbiI3Q2Z (ORCPT ); Fri, 30 Sep 2022 12:28:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232081AbiI3Q2P (ORCPT ); Fri, 30 Sep 2022 12:28:15 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C33315D9A2 for ; Fri, 30 Sep 2022 09:28:14 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id a10so5383436ljq.0 for ; Fri, 30 Sep 2022 09:28:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date; bh=N9stoL3Z4xv/2HiFGwv9P1b77a1ZbeVeGDhCsOfRE9Y=; b=LWgWLTY6nJES8ep4CqsjtiHuM8TU8Oe8vxiKqtllp0XMdbckMAw0Ga7+/ebIt++l+0 1JPyhSF+rD/yHxLg6i8MGLXOobhQjo5E6eq/NIsdGK291GrNRg2VlcLfc5ArSSYr0jEu koN8Tddl45RwUapmwGC+Rlg/Yd4oCZPcAf1gr6jxqvs0MHrRkDq4+YjLR4LwQiZ5rFm6 69cxpGhLTF5aqNuHOEQj3jyRTRDj922lrbasPfAwkTW2FwvnjAMbxt+8WG6DC9pneGMH YlzwT6j1/FxdjElh/g/qeLAbI5UQkbzqncBo/NG9f0lpLBkWIcoBrNBhYvmeH8gaqkbv DK9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date; bh=N9stoL3Z4xv/2HiFGwv9P1b77a1ZbeVeGDhCsOfRE9Y=; b=vRoYu5W4Q80xnYnPdtC0/J0xUthQYzA/Xu2TxoQqclz+7x9XftWcYBfSGNCdijSehu 1NGgwluhfNp8GrCeDgf/3KWC6Ch8Z4vK5gh54wZF4I/aAa8A754rTnC/g/2/CE7wWYGh 6duZJMBka4RDb62CENIb0yGUuGi94mo/aE72ndH/3dJAeKdUA7kp1W3mpah3BMJV7b1b TLpSRRLGgwffyseEvs79+3D7ZUdOuQO6EPM+VoFdptzn5cswmtZK/rNQcOwldNgrTO+h 364KBcmR4qmzKjYQyM/mOmSQqv6N2sjS8wbfQqxODsRgdz0kUwvVseaN6fJDmrCuvpnt HzDw== X-Gm-Message-State: ACrzQf3R8PtpXRm0Kw8r5HkTs+WDAs0yTfF5R4CBZgME24PGonCIlPyw dXekvau9retIW1I6kovCkqZh8Q== X-Google-Smtp-Source: AMsMyM7YF7JcFCSG7nRPBiGZtKAPOYdh4i8Zsci9QOiXvjHrtJrV5Zc+iYQc4EXnuPpqkKisPo98ag== X-Received: by 2002:a2e:9202:0:b0:26b:df14:cd with SMTP id k2-20020a2e9202000000b0026bdf1400cdmr3050555ljg.212.1664555292418; Fri, 30 Sep 2022 09:28:12 -0700 (PDT) Received: from [192.168.0.21] (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id k21-20020a05651210d500b00498ebd60c35sm337724lfg.165.2022.09.30.09.28.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 30 Sep 2022 09:28:12 -0700 (PDT) Message-ID: Date: Fri, 30 Sep 2022 18:28:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: linux-next: manual merge of the mfd tree with the qcom tree To: Lee Jones Cc: broonie@kernel.org, Bjorn Andersson , Linux Kernel Mailing List , Linux Next Mailing List References: <20220930115816.128513-1-broonie@kernel.org> <1e9a21a3-d6c3-3f76-18dc-ff14e8609846@linaro.org> Content-Language: en-US From: Krzysztof Kozlowski In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 30/09/2022 14:45, Lee Jones wrote: > On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote: > >> On 30/09/2022 13:58, broonie@kernel.org wrote: >>> Hi all, >>> >>> Today's linux-next merge of the mfd tree got a conflict in: >>> >>> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml >>> >> >> Thanks Mark. >> >>> between commit: >>> >>> 4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices") >> >> It seems this commit was picked by both Bjorn/qcom and Lee/MFD. >> >>> >>> from the qcom tree and commits: >>> >>> f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices") >>> a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018") >> >> This commit depends on the duplicated one (on "Add several devices"), so >> I think all set can stay in MFD and instead Bjorn could drop his copy of >> the commit. > > Not sure why Bjorn is picking up MFD patches? > > Was this a mistake Bjorn? This was a part of big set MFD + ARM64 dts, so I guess it just slipped in: https://lore.kernel.org/all/20220819083209.50844-1-krzysztof.kozlowski@linaro.org/ Best regards, Krzysztof