Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
efdda175c07f ("arm64: defconfig: add spmi and usb related configs")
from the arm-soc tree and commit:
a9c42f02387c ("arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 ph
On Wednesday 02 December 2015 11:21:09 Mark Brown wrote:
>
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/mach-shmobile/Kconfig between commit e32465429490 ("ARM: use "depends
> on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
> commit 9b5ba
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/Kconfig between commit e32465429490 ("ARM: use "depends
on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
commit 9b5ba0df4ea4f94 ("ARM: shmobile: Introduce ARCH_RENESAS") from
Hi Simon,
Today's linux-next merge of the renesas tree got conflicts in:
arch/arm/mach-shmobile/board-marzen-reference.c and
arch/arm/mach-shmobile/board-marzen.c
between commit:
3017a8804ada ("ARM: appropriate __init annotation for const data")
from the arm-soc tree and commits:
d2fb
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in:
arch/arm/mach-shmobile/setup-r8a7779.c
between commit:
3017a8804ada ("ARM: appropriate __init annotation for const data")
from the arm-soc tree and commit:
131c2e0480b0 ("ARM: shmobile: r8a7779: Generic CCF and ti
On Thu, Jan 15, 2015 at 1:38 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
> tree and commits 9ccba8abd0a
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
build dtb if associated Arch and/or SoC is enabled") from the arm-soc
tree and commits 9ccba8abd0a7 ("ARM: shmobile: kzm9g: Build DTS for
Multiplatform")
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/boot/dts/r8a7790-lager.dts between commit 637193b2f22c ("Merge
branch 'next/boards' into for-next") from the arm-soc tree and commit
2a3bd7497db1 ("Merge branch 'heads/dt-scif-for-v3.16' into next") from
the renesas
Quoting Nicolas Ferre (2014-01-06 01:44:27)
> On 04/01/2014 06:11, Olof Johansson :
> > On Mon, Dec 16, 2013 at 2:00 AM, Nicolas Ferre
> > wrote:
> >> On 16/12/2013 00:47, Stephen Rothwell :
> >>> Hi Simon,
> >>>
> >>> Today's linux-next merge of the renesas tree got a conflict in
> >>> drivers/c
On 04/01/2014 06:11, Olof Johansson :
> On Mon, Dec 16, 2013 at 2:00 AM, Nicolas Ferre
> wrote:
>> On 16/12/2013 00:47, Stephen Rothwell :
>>> Hi Simon,
>>>
>>> Today's linux-next merge of the renesas tree got a conflict in
>>> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
On Sat, Jan 04, 2014 at 10:43:46PM +1100, Stephen Rothwell wrote:
> Hi Olof,
>
> On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson wrote:
> >
> > Now I can't resolve it properly and move the entries when I do the
> > same merge (and get the same conflict), because that will cause a
> > third confl
Hi Olof,
On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson wrote:
>
> Now I can't resolve it properly and move the entries when I do the
> same merge (and get the same conflict), because that will cause a
> third conflict for Stephen, and he's about to return from vacation and
> is going to cuss a
On Mon, Dec 16, 2013 at 2:00 AM, Nicolas Ferre wrote:
> On 16/12/2013 00:47, Stephen Rothwell :
>> Hi Simon,
>>
>> Today's linux-next merge of the renesas tree got a conflict in
>> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
>> base support") from the arm-soc tree and com
On Mon, Dec 16, 2013 at 11:00:54AM +0100, Nicolas Ferre wrote:
> On 16/12/2013 00:47, Stephen Rothwell :
> > Hi Simon,
> >
> > Today's linux-next merge of the renesas tree got a conflict in
> > drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> > base support") from the arm-so
On 16/12/2013 00:47, Stephen Rothwell :
> Hi Simon,
>
> Today's linux-next merge of the renesas tree got a conflict in
> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
> shmobile: Add R-Car Gen2 clocks sup
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
I fixed it up (see be
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/setup-r8a7740.c between commit 0583fe478a7d ("ARM:
convert arm/arm64 arch timer to use CLKSRC_OF init") from the arm-soc
tree and commit 74d6523995cc ("ARM: shmobile: r8a7740: Prepare for
reference DT s
17 matches
Mail list logo
