Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422822AbWJZJEF (ORCPT ); Thu, 26 Oct 2006 05:04:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422809AbWJZJEE (ORCPT ); Thu, 26 Oct 2006 05:04:04 -0400 Received: from witte.sonytel.be ([80.88.33.193]:13043 "EHLO witte.sonytel.be") by vger.kernel.org with ESMTP id S1422822AbWJZJEA (ORCPT ); Thu, 26 Oct 2006 05:04:00 -0400 Date: Thu, 26 Oct 2006 11:03:45 +0200 (CEST) From: Geert Uytterhoeven To: Jan Engelhardt cc: Dick Streefland , Linux Kernel Development Subject: Re: What about make mergeconfig ? In-Reply-To: Message-ID: References: <3d6d.453f3a0f.92d2c@altium.nl> <1161755164.22582.60.camel@localhost.localdomain> <3d6d.453f3a0f.92d2c@altium.nl> <31ed.453f5399.96651@altium.nl> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1295 Lines: 36 On Thu, 26 Oct 2006, Jan Engelhardt wrote: > >| >Can't you do that with just a sort command? > >| > > >| > sort .config other.config > new.config > >| > >| That does not work where .config and other.config have the same symbol > >| listed, kconfig will bark and use the first value encountered. Because I > >| do have exactly that problem with my patch series (changes some Ys to > >| Ms), I am in need of the following patch to Kconfig TDTRT. > > > >Or you can use the following hack: > > > > (sort .config other.config; echo set) | sh | grep ^CONFIG_ > new.config > > That does not properly deal with "# CONFIG_XYZ is not set" lines in > other.config. What about RCS merge? merge -p other.config .config.old .config > other.config.new Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds - 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/