From patchwork Wed Oct 28 00:42:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 7505701 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 98E809F71A for ; Wed, 28 Oct 2015 00:43:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D884420898 for ; Wed, 28 Oct 2015 00:43:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC877208D1 for ; Wed, 28 Oct 2015 00:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754977AbbJ1Amw (ORCPT ); Tue, 27 Oct 2015 20:42:52 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:36208 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754964AbbJ1Amt (ORCPT ); Tue, 27 Oct 2015 20:42:49 -0400 Received: by pacfv9 with SMTP id fv9so248528107pac.3 for ; Tue, 27 Oct 2015 17:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Txo+wLnl7wRHsL7QsHkat6hhLOwRFbjb+lAPRufD6eE=; b=a9FJW7vo7CY1MTqhrPKDWGu0+/PHLIfuh3WeKzJyRFDIEoTwnAQ1SUZ9buj8T58/6u wEbURNpNN07JawgVjgO0tFMdr0/3OaUeqSg4/OlwekHeB2EWvZpZ6RIKa1vg6lao8vdS 3P/RSHpkkyzASWzIUqTOgEJSpOzcPVbGujK/8O0UQONmvpqd/c4yd1xPInbLAcf/r7qd eO4xSW6Le8nXIvi6Ul0+6ufyquGRbDrbLg0GsyvScdFVmcNmhGohbwUGfCjv68SIwuRZ vKLn7jW9+jifObUzJ3lyiS7Q08TzgYd5bcWE1mVDfRas5+y8HEDyyajCLVhURgQTGd54 i4+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Txo+wLnl7wRHsL7QsHkat6hhLOwRFbjb+lAPRufD6eE=; b=FRA3MqzXiix42+kyEVhE+BW83ZqJIs5ZxRTb43YvRwzktfbiUj1VKwEmq7YceCDRzf o5Eoj8KxzrnTd+jT8LC3Di7gnr0+rz+dgTSYKJoIloOL0obYfc6GJEpz6+0KPT8NFEvU BTKA3XZ8MjFhO349H8e0HibTbDpw9sEu2f/NGjWQ22knTnkTpOv+7uEq6acyHWD/pdIk cIYcH4Z9MgFS6fh4yAdtc80dOjWCs0wB0smiN0R5kuqKAeoTB2JlHT3GfhKR1kL2lu/p AWcwrnvv9V8wrQX/onJHprGBKgVtw38xGqtPfbuA4HDGTxLsRqj+q5ktGVa8cFsFKSlo n0bw== X-Gm-Message-State: ALoCoQkdcTHkD8uU/8qs+Ht9UWImWKfxQ48KCjkQhQK+OcjfSEsre0LUS4CB1C2teEZ3sTbQKW9y X-Received: by 10.66.161.35 with SMTP id xp3mr31353267pab.13.1445992968925; Tue, 27 Oct 2015 17:42:48 -0700 (PDT) Received: from localhost.localdomain ([58.123.138.250]) by smtp.gmail.com with ESMTPSA id t9sm41801385pbs.17.2015.10.27.17.42.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Oct 2015 17:42:47 -0700 (PDT) From: Olof Johansson To: Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, dvhart@linux.intel.com, Olof Johansson Subject: [PATCH 06/10] merge_config.sh: only consider last value of symbols Date: Wed, 28 Oct 2015 09:42:07 +0900 Message-Id: <1445992931-28107-7-git-send-email-olof@lixom.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445992931-28107-1-git-send-email-olof@lixom.net> References: <1445992931-28107-1-git-send-email-olof@lixom.net> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Olof Johansson Reviewed-by: Darren Hart --- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 933f2d6..1945b2c 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -39,7 +39,7 @@ usage() { } getval() { - grep -w -e "$1" "$2" | sed 's/^CONFIG_\(.*\)=n$/# CONFIG_\1 is not set/g' + grep -w -e "$1" "$2" | tail -1 | sed 's/^CONFIG_\(.*\)=n/# CONFIG_\1 is not set/g' } CONF_IS_ERR=false