Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp3538164rwb; Fri, 30 Sep 2022 05:10:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79bPzyqUZ453yZqmsll2Bjubko1rfYbLg26vf/oNdvOMwVt/BzjgJs3yh0+EEB5U8DwpMw X-Received: by 2002:a17:907:2d13:b0:783:eb5b:a32b with SMTP id gs19-20020a1709072d1300b00783eb5ba32bmr6374673ejc.175.1664539822990; Fri, 30 Sep 2022 05:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664539822; cv=none; d=google.com; s=arc-20160816; b=AbOYz1HOjJc3bUVQ1QBAE0sat7Y5byWNDoHCS1yrNTHW9tQyu4lE+AV1B8mldXEV8E VaAACBJziPC1WDBAenT8Kl/DvwvnSoUbvn/PAAzvgAzSPOrCsBdwMDimUsLo+dBIgk0t eZEpcNWybMlsStRzNAV7p+2HWcu6W+KtWWHDY2yoy61vKI/N8hTxo5tpQ2+4lza5KVLN KWVR8bSsXZ9JTzPD92tKSoZUkIzSNdPATlmWorSgv4OrwuIFAsZe+A27w3KxGIEy3cIH Li78wZ3xPAxChqKlULmm+Z09xekByMst5+KOPKiTMZ0+InZH097Ee6H7rBIJNBxqQyjt JHjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=g2Vi6S1xLo1C0yB0Gp5jyGy4Md/rd2l9tDLEi6Y5jsQ=; b=jUnk9xd0w/oEnI24zkrHForK70wAAFJM+bMlm3TvqpXn0+YBs1CvCX4/DUT5GopcE+ QZEoxKRSasOjGhauAONElISUpH2b4hetJ5pjEupIhJxQQ/hh2uoQe8KRE8Gkkr3+VM/o +hWcV76pWe9H5A2wB9yfqL0v08W5De/aCBp9l1QTyAciRjg1I6WSHBIrJxrC+0s0rgKr wqbD1PkcXq7oz03iPabxZCLGtGJN0jM2SkvRJj1RqABpgd1/hwCBlAByyCZ3OtdLhpFd 8MbC7LkWmrYOo7ow2AGbwXg+O59UcxtFJDAytjg/okF3ca0uIw71Jku+rAzIixjYXjYN iT4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L1XsEQr+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z20-20020a1709067e5400b00783d10996f7si1486479ejr.606.2022.09.30.05.09.56; Fri, 30 Sep 2022 05:10:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L1XsEQr+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231342AbiI3L6Y (ORCPT + 99 others); Fri, 30 Sep 2022 07:58:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231320AbiI3L6W (ORCPT ); Fri, 30 Sep 2022 07:58:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D01A15FC7C; Fri, 30 Sep 2022 04:58:21 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 08A106230C; Fri, 30 Sep 2022 11:58:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3017FC433D6; Fri, 30 Sep 2022 11:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664539100; bh=wsb962dMKRh67QppXhCfHwWVKv37pVodkZIc29Rre7o=; h=From:To:Cc:Subject:Date:From; b=L1XsEQr+hrLzLPqpP4SmZPwTNkks4X6J6VEd9w9hLVMqwk+PRgAcj271QdyUJZEkL 9tzhPSSccqDyafu7s9Gfypcs3+MA8WD72kKKoQTGBmCqXV5V1xIpGJOS6T5SVhZL1A 4CiJDWRt4C0MsxfA3Yox/uCNhDorpdV4S6dC8lmUhsb/6TqqCDr9pkzHt1ug1A+muu nrD7bZmnRl7KlCks8SIMsXR3qcaBkg/GVQIKdI4AS/EPBorq6ZwignaOaGGTdddSmJ snxOhQTGqxFj1+9QTUiq7dT67LmPg74gR3gHCxJRMOaBtELPISYSx5jylWdFNI8Yhj /t7c5D1wjbQhQ== From: broonie@kernel.org To: Lee Jones Cc: Bjorn Andersson , Krzysztof Kozlowski , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the mfd tree with the qcom tree Date: Fri, 30 Sep 2022 12:58:16 +0100 Message-Id: <20220930115816.128513-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the mfd tree got a conflict in: Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml between commit: 4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices") 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") from the mfd 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/mfd/qcom,tcsr.yaml index d3c25daa995e4,b12809b5cc22e..0000000000000 --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml @@@ -15,31 -15,27 +15,27 @@@ description properties: compatible: - items: - - enum: - - qcom,msm8998-tcsr - - qcom,qcs404-tcsr - - qcom,sc7180-tcsr - - qcom,sc7280-tcsr - - qcom,sdm630-tcsr - - qcom,sdm845-tcsr - - qcom,sm8150-tcsr - - qcom,tcsr-apq8064 - - qcom,tcsr-apq8084 - - qcom,tcsr-ipq6018 - - qcom,tcsr-ipq8064 - - qcom,tcsr-mdm9615 - - qcom,tcsr-msm8660 - - qcom,tcsr-msm8916 - - qcom,tcsr-msm8953 - - qcom,tcsr-msm8960 - - qcom,tcsr-msm8974 - - qcom,tcsr-msm8996 - - const: syscon + oneOf: + - items: + - enum: + - qcom,msm8998-tcsr + - qcom,qcs404-tcsr + - qcom,sc7180-tcsr + - qcom,sc7280-tcsr + - qcom,sdm630-tcsr + - qcom,sdm845-tcsr + - qcom,sm8150-tcsr + - qcom,tcsr-apq8064 + - qcom,tcsr-apq8084 + - qcom,tcsr-ipq8064 + - qcom,tcsr-mdm9615 + - qcom,tcsr-msm8660 + - qcom,tcsr-msm8916 + - qcom,tcsr-msm8953 + - qcom,tcsr-msm8960 + - qcom,tcsr-msm8974 + - qcom,tcsr-msm8996 + - const: syscon - - items: - - const: qcom,tcsr-ipq6018 - - const: syscon - - const: simple-mfd reg: maxItems: 1