From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757938AbbLBLgF (ORCPT ); Wed, 2 Dec 2015 06:36:05 -0500 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 From: Arnd Bergmann To: Mark Brown Cc: Simon Horman , Masahiro Yamada , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151202112109.342837c08019e632b28020fc@kernel.org> References: <20151202112109.342837c08019e632b28020fc@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:imWvuHtYFzgNUCuaCZi++Unk4/zfuRvdid0GjwnViHnwBnd6rE3 HgUSle9Jw6Ow88Ozd0O1oIdKyc28gMC4w2yFyc+bOqfX0NaEhz2JNA7fCsOaNX3+Uv3V+57 ml9Ua8zVI/r7rcjYzyst8YMMOhbuguSjFLShf1N12093UUgq3O/N6K54Mxte6yIv/LMmf6e xuDDehya6i0utxuGl8A2g== X-UI-Out-Filterresults: notjunk:1;V01:K0:5BJaQUWNAcQ=:RX6alEkpJJEvAt8qNLK9uG rCvqnXNgy4a+Gcm+T+Cm23k+cZ8eM3L6r+9toJqlSXFIHdP4Et2EvUTiEq4Sj9UY3NkZKTcMc Uuj4WgEhf9BNXW2KNZFICdQhT9AgRr0UmntmsPNYmf2c+eIyZfRYDi/VeCr3N76XoQRMSb6Xp NnpsIZh4RV2EM/DSzkfQzG6he2XLq0xho42d5ZvP2Hxy0/DGhx1awbLqvpw/r5mSO0hfMt7Ec GH5AxmbIyXJGvbUiMY2gGvNlb2kBzCXZV1eL663EJBxdEdSD2ThCPbfh0rzOAjVQWpEfTwduZ rw1pjXMGYhLYCEJ68QKL6CTgZQ115jAh2agV1yebfEjx9GDDRlYStn7FBNkMmjct2Bkztbogj VETo8xyav0uM0LSbB3+6KCCJKRol+a5SR9yeOtebaXLWuYVFVoOEVfMklu49TslWqHiGhAaJe JCFQXjqiGKw8iQTsvdoVytx0ohtq++ro/rh7NH+vGf0pbot+KJP8xomuFfIshaJFltsvqMLPO XR1X/u+zWuYBK+8BBwo52pFK53V5gmjZv0His5RAjsfcLvQImCQC/ATcRtR8kHxjWasFG0U2t xvcbBCxjyXMgLuZaup9jYOmiPajbVlrvFYoYLvH6Tu+KO523D1SvuvDLai1ctmCbWooY0h6NQ S1kXrhwJQ92NAHeLdE4V93RIdxylez4mwn2jSxCwtnwQ6if0sC778yOyJRQ2pxvsmEowmkFXU oUuRkTdFJtRGPqQP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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