lkml.org 
[lkml]   [2015]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the renesas tree with the arm-soc tree
Date
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 9b5ba0df4ea4f94 ("ARM: shmobile: Introduce ARCH_RENESAS") from the
> renesas tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

(as predicted by Simon ;-) )

I plan to put the cross-platform changes I have in next/cleanup into a separate
branch that can be pulled into other branches to resolve those issues.

Arnd


\
 
 \ /
  Last update: 2015-12-02 13:01    [W:0.033 / U:4.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site