Re: linux-next: manual merge of the renesas tree with the arm tree

2017-03-20 Thread Simon Horman
On Mon, Mar 20, 2017 at 10:04:11AM +1100, Stephen Rothwell wrote: > 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 co

linux-next: manual merge of the renesas tree with the arm tree

2017-03-19 Thread Stephen Rothwell
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.

linux-next: manual merge of the renesas tree with the arm tree

2014-07-06 Thread Stephen Rothwell
Hi Simon, Today's linux-next merge of the renesas tree got a conflict in arch/arm/mach-shmobile/headsmp.S between commit 8a3a9dd50dd9 ("ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree and commit 8b438bcb9009 ("ARM: shmobile: Allow use of boot code for non-SMP case") fro

linux-next: manual merge of the renesas tree with the arm tree

2013-07-01 Thread Stephen Rothwell
Hi Simon, Today's linux-next merge of the renesas tree got a conflict in arch/arm/mach-shmobile/Kconfig between commit fb521a0da155 ("arm: fix up ARM_ARCH_TIMER selects") from the arm tree and commits 462972da5f18 ("ARM: shmobile: Make r8a7790 Arch timer optional") and 39d97587d6cb ("ARM: shmobile