From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Simon Horman <horms@verge•net.au>, Russell King <rmk@armlinux•org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chris Brandt <chris.brandt@renesas•com>
Subject: linux-next: manual merge of the renesas tree with the arm tree
Date: Mon, 20 Mar 2017 10:04:11 +1100 [thread overview]
Message-ID: <20170320100411.6970f7b1@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the renesas tree got a conflict in:
arch/arm/boot/dts/r7s72100.dtsi
between commit:
f08578e6da96 ("ARM: 8661/1: dts: r7s72100: add l2 cache")
from the arm tree and commit:
69ed50de582e ("ARM: dts: r7s72100: Add watchdog timer")
from the renesas 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 arch/arm/boot/dts/r7s72100.dtsi
index 1cf2bd038090,9b12d73e67dc..000000000000
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@@ -369,16 -371,13 +372,23 @@@
<0xe8202000 0x1000>;
};
+ L2: cache-controller@3ffff000 {
+ compatible = "arm,pl310-cache";
+ reg = <0x3ffff000 0x1000>;
+ interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+ arm,early-bresp-disable;
+ arm,full-line-zero-disable;
+ cache-unified;
+ cache-level = <2>;
+ };
+
+ wdt: watchdog@fcfe0000 {
+ compatible = "renesas,r7s72100-wdt", "renesas,rza-wdt";
+ reg = <0xfcfe0000 0x6>;
+ interrupts = <GIC_SPI 106 IRQ_TYPE_EDGE_RISING>;
+ clocks = <&p0_clk>;
+ };
+
i2c0: i2c@fcfee000 {
#address-cells = <1>;
#size-cells = <0>;
next reply other threads:[~2017-03-19 23:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-19 23:04 Stephen Rothwell [this message]
2017-03-20 8:07 ` linux-next: manual merge of the renesas tree with the arm tree Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2014-07-07 1:32 Stephen Rothwell
2013-07-02 5:45 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=20170320100411.6970f7b1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chris.brandt@renesas$(echo .)com \
--cc=horms@verge$(echo .)net.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@armlinux$(echo .)org.uk \
/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