Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753308AbbEUD3Q (ORCPT ); Wed, 20 May 2015 23:29:16 -0400 Received: from mail.kernel.org ([198.145.29.136]:33818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751117AbbEUD3M (ORCPT ); Wed, 20 May 2015 23:29:12 -0400 Message-ID: <555D50FF.9060700@kernel.org> Date: Thu, 21 May 2015 12:29:03 +0900 From: Kukjin Kim User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Lightning/1.0b3pre Thunderbird/3.1.16 MIME-Version: 1.0 To: Krzysztof Kozlowski CC: Geert Uytterhoeven , Stephen Rothwell , Kukjin Kim , Geert Uytterhoeven , Arnd Bergmann , Ard Biesheuvel , Nicolas Ferre , "linux-kernel@vger.kernel.org" , Masahiro Yamada , Linux-Next , Alexandre Belloni , "linux-arm-kernel@lists.infradead.org" , Olof Johansson , Lee Jones , Javier Martinez Canillas , Baruch Siach , Maxime Coquelin Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc andat91 trees References: <20150520102743.3d336a73@canb.auug.org.au> <20150520091646.GF3338@piout.net> In-Reply-To: X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2194 Lines: 54 On 05/21/15 10:20, Krzysztof Kozlowski wrote: > 2015-05-20 18:47 GMT+09:00 Geert Uytterhoeven : >> On Wed, May 20, 2015 at 11:16 AM, Alexandre Belloni >> wrote: >>> On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote : >>>> 2015-05-20 9:27 GMT+09:00 Stephen Rothwell : >>>>> Today's linux-next merge of the samsung tree got a conflict in >>>>> arch/arm/configs/multi_v7_defconfig between various commits from the >>>>> arm-soc and at91 trees and various commits from the samsung tree. >>>>> >>>>> I fixed it up (see below) and can carry the fix as necessary (no action >>>>> is required). >>>> >>>> Hi, >>>> >>>> Thanks for the merge. >>>> >>>> The parts coming from samsung-soc related to manually toggling stuff >>>> (by me and Javier) look fine. The rest (coming from Kukjin's >>>> savedefconfig) I don't know - too much of them. >>>> >>> >>> Hum, last time I asked, we were not supposed to do a savedefconfig on >>> multi_v7... >> >> Yeah, IMHO it's something the arm-soc maintainers should do only right >> after rc1. >> >> Doing it at any other point in time may remove options that have just been >> added to multi_v7_defconfig by an arm-soc submaintainer, and that depend on >> a Kconfig change queued in another maintainer's for-next branch. > > It also depends on which tree and branch the savedefconfig was > performed. If on Linus' master then probably it is not a good idea at > any time. > >> Personally, I think no arm-soc submaintainer should touch multi_v7_defconfig, >> and all changes should be applied by the arm-soc maintainers. > > Actually Arnd suggested this: > https://lkml.org/lkml/2015/5/15/303 > [PATCH 0/9] multi_v7_defconfig: Enable options for Exynos Chromebooks > Thanks you guys. I've sent a pull-request for the update of multi_v7_defconfig just now. And IMHO need to keep it with savedefconfig from now on... - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/