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 X-Spam-Level: X-Spam-Status: No, score=-14.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5422EC4338F for ; Wed, 28 Jul 2021 12:43:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EA0160FA0 for ; Wed, 28 Jul 2021 12:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235270AbhG1MnT (ORCPT ); Wed, 28 Jul 2021 08:43:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:44286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234759AbhG1MnQ (ORCPT ); Wed, 28 Jul 2021 08:43:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id ADB7A60F9C; Wed, 28 Jul 2021 12:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627476195; bh=Gsg1jrEEwhKgw10WMa7bDBrN6VmhryIEfCoYsaT7HQc=; h=From:To:Cc:Subject:Date:From; b=aw2x60ZH/4rkQ7KJEjnT6kq6mqK8P3Sy+/w7BX+FIlOqE/XYGPlOkbN7nh80oLX7y 6eY13lnlQpHCuCGNCp6S2b8CVK/IsRYOCjy7gUz8lP6bIggZhHEnsEN9Odf/vvuwfB YiiO5jc+ErGE6ADWydpWGn1cxx7CJNTyIHgzKNPgCPCeToByD4Szfs2aINkmZsNFGX 7K+ua8RU/WvR9AUB0F/g4zurOfpy0XLUMw8USsec0ZPfqrwKBt+Gu8RTAVEKGICZ7j U1Y4/vSO5MdUx96wAmGlES5jKqAUhOqyuR80qwZyXWzKx8uIq+e5EbVGzQYLIdzvZ/ PW+0QB6jZNrwg== From: Mark Brown To: Rob Herring Cc: Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring , Stephen Boyd , Chun-Jie Chen , Fabien Parent Subject: linux-next: manual merge of the devicetree tree with the clk tree Date: Wed, 28 Jul 2021 13:43:04 +0100 Message-Id: <20210728124304.1199-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml between commit: d18eb76bbd69 ("dt-bindings: ARM: Mediatek: Add mmsys document binding for MT8192") from the clk/clk-next tree and commit: cba3c40d1f97 ("dt-bindings: arm: mediatek: mmsys: convert to YAML format") from the devicetree 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 --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml index 2d4ff0ce387b..f9ffa5b703a5 100644 --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml @@ -29,6 +29,7 @@ properties: - mediatek,mt8167-mmsys - mediatek,mt8173-mmsys - mediatek,mt8183-mmsys + - mediatek,mt8192-mmsys - mediatek,mt8365-mmsys - const: syscon - items: