From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Wim Van Sebroeck <wim@iguana•be>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Sean Wang <sean.wang@mediatek•com>,
Guenter Roeck <linux@roeck-us•net>,
Matthias Brugger <mbrugger@suse•com>,
Matthias Brugger <matthias.bgg@gmail•com>,
Rob Herring <robh@kernel•org>
Subject: linux-next: manual merge of the watchdog tree with the arm-soc tree
Date: Mon, 11 Sep 2017 10:58:40 +1000 [thread overview]
Message-ID: <20170911105840.55eee273@canb.auug.org.au> (raw)
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in:
Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
between commit:
275e85971b7d ("ARM: mediatek: dts: Cleanup bindings documentation")
from the arm-soc tree and commit:
e8a7fc711c9a ("dt-bindings: watchdog: mediatek: add support for MediaTek MT7623 and MT7622 SoC")
from the watchdog 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.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
index 20ada673ab0c,096bbfbbae1b..000000000000
--- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
@@@ -3,9 -3,11 +3,11 @@@ Mediatek SoCs Watchdog time
Required properties:
- compatible should contain:
- * "mediatek,mt2701-wdt" for MT2701 compatible watchdog timers
- * "mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622
- * "mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623
- * "mediatek,mt6589-wdt" for all compatible watchdog timers (MT2701,
- MT6589)
+ "mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701
++ "mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622
++ "mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623
+ "mediatek,mt6589-wdt": for MT6589
+ "mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797
- reg : Specifies base physical address and size of the registers.
next reply other threads:[~2017-09-11 0:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 0:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-03-07 4:04 linux-next: manual merge of the watchdog tree with the arm-soc tree Stephen Rothwell
2016-03-07 5:41 ` Olof Johansson
2016-03-07 12:19 ` Sudeep Holla
2016-03-07 19:00 ` Olof Johansson
2016-03-08 10:10 ` Sudeep Holla
2016-03-07 18:54 ` Wim Van Sebroeck
2016-03-07 19:00 ` Olof Johansson
2016-03-08 15:52 ` André Przywara
2016-03-08 16:03 ` Fu Wei
2016-03-08 16:55 ` Sudeep Holla
2016-03-08 16:06 ` Sudeep Holla
2016-03-08 16:07 ` André Przywara
2014-03-03 5:38 Stephen Rothwell
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=20170911105840.55eee273@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=matthias.bgg@gmail$(echo .)com \
--cc=mbrugger@suse$(echo .)com \
--cc=olof@lixom$(echo .)net \
--cc=robh@kernel$(echo .)org \
--cc=sean.wang@mediatek$(echo .)com \
--cc=wim@iguana$(echo .)be \
/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