From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Macpaul Lin <macpaul.lin@mediatek•com>,
Bartosz Golaszewski <bgolaszewski@baylibre•com>
Subject: linux-next: manual merge of the net-next tree with the clk tree
Date: Tue, 2 Jun 2020 12:09:57 +1000 [thread overview]
Message-ID: <20200602120957.1351bda0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
between commit:
7b9e111a5216 ("dt-bindings: clock: mediatek: document clk bindings for Mediatek MT6765 SoC")
from the clk tree and commit:
9f9d1e63dc55 ("dt-bindings: convert the binding document for mediatek PERICFG to yaml")
from the net-next tree.
I fixed it up (I deleted the file and added the following patch) 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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 2 Jun 2020 12:07:03 +1000
Subject: [PATCH] dt-bindings: fix up for "dt-bindings: clock: mediatek:
document clk bindings for Mediatek MT6765 SoC"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
.../devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
index 55209a2baedc..e271c4682ebc 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
@@ -20,6 +20,7 @@ properties:
- enum:
- mediatek,mt2701-pericfg
- mediatek,mt2712-pericfg
+ - mediatek,mt6765-pericfg
- mediatek,mt7622-pericfg
- mediatek,mt7629-pericfg
- mediatek,mt8135-pericfg
--
2.26.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-06-02 2:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 2:09 Stephen Rothwell [this message]
2020-06-04 1:29 ` linux-next: manual merge of the net-next tree with the clk tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-04-19 14:13 broonie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200602120957.1351bda0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bgolaszewski@baylibre$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=macpaul.lin@mediatek$(echo .)com \
--cc=mturquette@baylibre$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sboyd@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox