From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <3662441.U0Roeq6f5X@wuerfel> References: <20151202112109.342837c08019e632b28020fc@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from mout.kundenserver.de ([212.227.126.134]:56356 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758010AbbLBLf7 (ORCPT ); Wed, 2 Dec 2015 06:35:59 -0500 In-Reply-To: <20151202112109.342837c08019e632b28020fc@kernel.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Mark Brown Cc: Simon Horman , Masahiro Yamada , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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