Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: linux-next: manual merge of the renesas tree with the arm-soc tree | Date | Wed, 02 Dec 2015 12:35:15 +0100 |
| |
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
| |