From patchwork Sat Jan 13 20:35:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Vandeputte X-Patchwork-Id: 860371 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VSIIcu5J"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ncentric.com header.i=@ncentric.com header.b="oH5/Vx6s"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zJrxT3390z9s4q for ; Sun, 14 Jan 2018 07:36:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=9rqyAA3dxJROGtPCFnGrPT3OgGtFaCTt+eSrMZg0sRA=; b=VSIIcu5Jimtrfr SFZRCmYQC0a7z3nOfCZagiGJUb9tJR4kkCpvUyWkiyWY+ZO4QsZLllU3Wqcs+LaMe0cmT04lW9AVI 9OVOHRoTIjIQIhO0+jgC6DiZo0vdlNxhKkT1r9giCiC7Yiq8f0c8DmDoIqYy2CZhqpUZiAdHs0nfM 9+IkgRa1z7RYx3UGCUA2frWJipyvfzBFD3MlGfvilfOHWvB33YC2Doso0/hEipiKAk1ywwqLXkxzY 8x4MB7VZZiXxLcmWVIpZrAO+gSFNMXQnLHuRKPTLbs09dVRhDUpJe4Opzh/xfX+wF2+pyA9HBsNCo 8d8rmoKjJCVfJ/P4fiYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eaSXJ-00043A-Hn; Sat, 13 Jan 2018 20:36:17 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eaSXG-0003RF-0t for lede-dev@lists.infradead.org; Sat, 13 Jan 2018 20:36:15 +0000 Received: by mail-wm0-x242.google.com with SMTP id f71so3322351wmf.0 for ; Sat, 13 Jan 2018 12:36:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncentric.com; s=google; h=from:to:cc:subject:date:message-id; bh=pPBE0NNLwsn2Htoc5TYAnsIMbMjvILWtxvx/5d8A9ks=; b=oH5/Vx6sBq7sJPyQPRMbL9sgNRrF+wjImmHwTsD8A3jEmS7tSHXSqjFSyzeORv2iTs +KfHvEao/qzD0HVryrTsOSUBYy4+/4/PJRHPt2Pj1yCl66qTI/46YmQ4r2pHXJCHsU3f iv7PmCtZGsYdeYRJUptiei01wvQgie8BEJpOg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pPBE0NNLwsn2Htoc5TYAnsIMbMjvILWtxvx/5d8A9ks=; b=H5qCMgU0V/mZbT+o3p0p2eGx3I4AwDnCVYxK9YIuLowLTKUjFL/2q/SVqj+l2OBsiP JPb8n1glrSscQQBysS+iQx0FqQ7qK0wXrRTt7e2dYwGWmzxDe+W7y1HN+GDcmfVDc2pX NbhnmogMw9u5BCVK8u9dE2osVoYzkLb18J8wBrE9fbu5RaFg7ezrE+mp2WCVTs7sFoWo YgoGUGSY+rbf4blHqM4R9H2AuTmObQNrnQIYBIQ+dKPgT/d8L3jtnOtQQWNSHIpL+OD/ Ly2biTk4ivpmWrmO48/ZeonQKSj/IabtJMa9fay0GW+A83AgafbuLtMpW9vw11paDhwy TUqg== X-Gm-Message-State: AKwxytcJaPc3+JkZhnQiqCff2rmZkA4OoZ1G5ep6il3Wk0yATwYTrzyu EoaxTLyAqmO8x3DMHwBhJt0Li4z6CEU= X-Google-Smtp-Source: ACJfBotkuJpJL0PU64f9LYxD7HrqZs/1MSWXQS7pVK7eepb0GXkyzv1oxv9jErL7VR5VYXUZsLfugQ== X-Received: by 10.80.148.49 with SMTP id p46mr3821975eda.237.1515875759763; Sat, 13 Jan 2018 12:35:59 -0800 (PST) Received: from localhost.localdomain (178-116-168-175.access.telenet.be. [178.116.168.175]) by smtp.googlemail.com with ESMTPSA id w51sm15348807edd.84.2018.01.13.12.35.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Jan 2018 12:35:59 -0800 (PST) From: Koen Vandeputte To: lede-dev@lists.infradead.org Date: Sat, 13 Jan 2018 21:35:48 +0100 Message-Id: <1515875748-8747-1-git-send-email-koen.vandeputte@ncentric.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180113_123614_228275_F88A1056 X-CRM114-Status: UNSURE ( 7.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH] config: don't define the same symbol twice X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Koen Vandeputte , john@phrozen.org MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org In commit fce35bce0f6e ("config: support new symbol intro'd in kernel 4.12") I forgot to remove the initial debug test line. This clearly is wrong as the same symbol is defined conditionally in the line below as it should be. I looked over it as I just checked if the symbol was present now upon testing it. Fixes: fce35bce0f6e ("config: support new symbol intro'd in kernel 4.12") Signed-off-by: Koen Vandeputte --- include/kernel-defaults.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 33f3a8210ff0..5e905a2faa68 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -63,7 +63,6 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Kernel/SetInitramfs/PreConfigure) echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config - echo 'CONFIG_INITRAMFS_FORCE=y' >> $(LINUX_DIR)/.config echo "$(if $(CONFIG_TARGET_INITRAMFS_FORCE),CONFIG_INITRAMFS_FORCE=y,# CONFIG_INITRAMFS_FORCE is not set)" >> $(LINUX_DIR)/.config echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config