From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [patch 1/8] init: rename CONFIG_EMBEDDED to CONFIG_EXPERT Date: Mon, 3 Jan 2011 12:10:30 -0800 Message-ID: <20110103121030.921f6ff2.akpm@linux-foundation.org> References: <20101230124535.GA3306@sgi.com> <201012301350.28862.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:54250 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755654Ab1ACULa (ORCPT ); Mon, 3 Jan 2011 15:11:30 -0500 In-Reply-To: Sender: linux-arch-owner@vger.kernel.org List-ID: To: David Rientjes Cc: Arnd Bergmann , Robin Holt , Ingo Molnar , Greg KH , "David S. Miller" , Jens Axboe , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org On Thu, 30 Dec 2010 11:17:32 -0800 (PST) David Rientjes wrote: > On Thu, 30 Dec 2010, Arnd Bergmann wrote: > > > > Doesn't this patch series break the 'bisectable' rule for patches? > > > I think you can get by with adding a CONFIG_EXPERT selects CONFIG_EMBEDDED > > > in the first patch and the last patch removing that same selects. > > > > How about leaving it that way during the merge window even? That would > > help people sending git pull requests that add new dependencies on > > CONFIG_EMBEDDED. David can submit another patch that removes the > > temporary CONFIG_EMBEDDED option along with any new users in -rc2 > > or for 2.6.39 then. > > > > Ok, so there are a few pending EMBEDDED dependency additions in linux-next > as of next-20101230, which should be a pretty good indicator of what type > of conflict we might risk during the merge window. > > - three new defconfig files: > > 89ba4d12: arch/arm/configs/ag5evm_defconfig > 6cfce27c: arch/arm/configs/omap1_defconfig > d58f0967: arch/blackfin/configs/BF561-EZKIT-SMP_defconfig > > - 3ce05168 (drm/kms: load fbcon from drm_kms_helper) > > - b595076a (tree-wide: fix comment/printk typos) > > Instead of CONFIG_EXPERT select CONFIG_EMBEDDED, we could add a ninth > patch which does CONFIG_EMBEDDED select CONFIG_EXPERT and tag it in some > way so we know it's only temporary for the merge window to find new > CONFIG_EMBEDDED entries. > > Andrew, this would be going through your -mm tree anyway, so how would you > prefer to merge it? um, one big patch shortly after -rc1 is released?