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 36EA5C433FE for ; Fri, 30 Sep 2022 12:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229843AbiI3MqB (ORCPT ); Fri, 30 Sep 2022 08:46:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229839AbiI3MqA (ORCPT ); Fri, 30 Sep 2022 08:46:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C226CD2C; Fri, 30 Sep 2022 05:45:59 -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 ams.source.kernel.org (Postfix) with ESMTPS id EA2D5B828A1; Fri, 30 Sep 2022 12:45:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2027AC433C1; Fri, 30 Sep 2022 12:45:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664541956; bh=35t7qQvnU5XSjtZ6QKxyr1wUdBmE2pOzmuZg69ufAV4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rvLRr3H7RS8XecmmidI85YkQayvi3MOxPjR98Tv3O3dhM+BQw6v5J02SStHROTmrQ CXQsORq93uDkYqZUPDcgOFD8e4t2EdDqEQUVRFihGwYjbqTl4ysUnGo821p0TbHYOg AKUP/EcrUEaxcyxiK8oi48vjSHuJnKL5cyQKAgcN1zqDLezysQ8alo66EM6ALc1oya xSWrd28ZfzIKYbTvbpnEHg2ISSywpHuv03HbCQlyQvT5SU/LqvhsGnUwtXnEIps1DI wE/gqMVoJJLgaBsNCMFIKJEjCKia1jYFMGsWcPfrqen4Aa40wBgYYSbiKLWU9+9sRA ImlESejc0wWjA== Date: Fri, 30 Sep 2022 13:45:51 +0100 From: Lee Jones To: Krzysztof Kozlowski Cc: broonie@kernel.org, Bjorn Andersson , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the mfd tree with the qcom tree Message-ID: References: <20220930115816.128513-1-broonie@kernel.org> <1e9a21a3-d6c3-3f76-18dc-ff14e8609846@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1e9a21a3-d6c3-3f76-18dc-ff14e8609846@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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? -- Lee Jones [李琼斯]