Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932076AbbEUBUq (ORCPT ); Wed, 20 May 2015 21:20:46 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:37125 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754712AbbEUBUo (ORCPT ); Wed, 20 May 2015 21:20:44 -0400 MIME-Version: 1.0 In-Reply-To: References: <20150520102743.3d336a73@canb.auug.org.au> <20150520091646.GF3338@piout.net> Date: Thu, 21 May 2015 10:20:43 +0900 X-Google-Sender-Auth: DjFyC6KeNC5RXHjatvtrWYmZveQ Message-ID: Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees From: Krzysztof Kozlowski To: Geert Uytterhoeven Cc: Alexandre Belloni , Stephen Rothwell , Krzysztof Kozlowski , Kukjin Kim , Geert Uytterhoeven , Arnd Bergmann , Ard Biesheuvel , Nicolas Ferre , "linux-kernel@vger.kernel.org" , Masahiro Yamada , Baruch Siach , Linux-Next , Olof Johansson , Lee Jones , Javier Martinez Canillas , "linux-arm-kernel@lists.infradead.org" , Maxime Coquelin Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1966 Lines: 49 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 Best regards, Krzysztof -- 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/