From patchwork Wed May 11 12:18:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102368 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp192622qge; Wed, 11 May 2016 05:19:23 -0700 (PDT) X-Received: by 10.98.30.131 with SMTP id e125mr4459890pfe.32.1462969163137; Wed, 11 May 2016 05:19:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 191si9305564pfa.182.2016.05.11.05.19.22; Wed, 11 May 2016 05:19:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbcEKMTV (ORCPT + 29 others); Wed, 11 May 2016 08:19:21 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:63897 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751404AbcEKMTU (ORCPT ); Wed, 11 May 2016 08:19:20 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MZlny-1bKtfA2e7C-00LW8e; Wed, 11 May 2016 14:18:50 +0200 From: Arnd Bergmann To: Joel Stanley Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME Date: Wed, 11 May 2016 14:18:24 +0200 Message-Id: <1462969128-4070058-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:fam6MQXA7+WARsiDHsJxeNcSsDHXWRjlycJwGqgBs27ZIqm/sWv b3qsdejIt5H1vehWc8gcFM/sxyUW2XeTznoaNZINmObaDzRxWQVTrFEGbx2JsnNItPxVhUW e4pdTE89n7s4Q9DD8WAAUIHwxLPI3Tsyo2aK119NcOLQ30XkkCRJ/ZzCsK98Kcnfw8gMGR1 sWhGdb50chfHietoEjKAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Yzp7NBEksxY=:AX8CNmlV2TyuyXVY8REjzN a6fXj+Lt7YEV412N/6vNSEwjSnGdJapI2hkqbjaug0QBfJAkiIMUDZzbxnecit94vqCmkMSRE 8u6tOnk7lVUC0/kH9/9Fc5WnulvL1W9ErHx7SZsKwdZv15ooTfXbQ+UV2b5+BUuWPYyb7iWRC c9TVCdFuFjMKdrkxFIZT4aCKkkJ9ijvuaNO7dSNLEyvGGSzcagjCgv5MmgMPlxIPs1ASR+jw3 lF92usMhxlOgEfgB5lb/j7oEE91PldI37capaCxHLtB4pryXRjCGFMauAeeWaL+bCn6dZ/n4M IajxIMD97dfCuLeqxIUlFNp/FemaPJAnsuYv+3G1+A2wjqwxXLcxXztlEkl7AjWqQhBQtYDzv m+N7HECORLOk0fn+Y8U47j796BvYBJZ6hxfjinrgPmsjGFpw2tmtO+9bX2o9wIITbY6a3Z7vY Vh9mOrGooRef4+/hOCoGZR22orFJ9/ocoS8JNt/xd1DlSstWNCoP70JNww3tN4KpvVVfGGFrx utaAY+I71NVxjAlzCn4EMn4HQQikmKg21y1LLqE1Pwhw9VLtMtd0R6sE6gNpAgC9eQXzlCo7V 3z7FAJHCvNduA1M5Ih19i8QF4Cl5D8rownjDcbylVm+x8kvg4PJvCxLCPEOjIz7ofJTYlJPSY YVD9rdaMzn6fJTQv5QRMXzkTgeslDpqFwF81T5j/a1cnTnKNpkCiRUFr6uykcGms1gYg= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 94ea9c7a579f ("lib, switch CONFIG_PRINTK_TIME to int") changes the type of CONFIG_PRINTK_TIME and adapts all existing defconfig files, while we add two new defconfig files with d0bc3483da87 ("arm/configs: Add Aspeed defconfig"), with the old type. This changes the two new defconfig files to match the other ones. As a result, we get harmless warnings for the arm-soc defconfig branch by itself, but everything will work when 4.7-rc1 is out. Signed-off-by: Arnd Bergmann --- I've applied this one to avoid introducing warnings in linux-next. I could have sorted out the ordering as well to avoid warnings in arm-soc/for-next, but it doesn't seem worth it as we are not regressing here. arch/arm/configs/aspeed_g4_defconfig | 2 +- arch/arm/configs/aspeed_g5_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig index ca39c04fec6b..b6e54ee9bdbd 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_g4_defconfig @@ -58,7 +58,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_FANOTIFY=y -CONFIG_PRINTK_TIME=y +CONFIG_PRINTK_TIME=1 CONFIG_DYNAMIC_DEBUG=y CONFIG_STRIP_ASM_SYMS=y CONFIG_PAGE_POISONING=y diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig index 4f366b0370e9..892605167357 100644 --- a/arch/arm/configs/aspeed_g5_defconfig +++ b/arch/arm/configs/aspeed_g5_defconfig @@ -59,7 +59,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_FANOTIFY=y -CONFIG_PRINTK_TIME=y +CONFIG_PRINTK_TIME=1 CONFIG_DYNAMIC_DEBUG=y CONFIG_STRIP_ASM_SYMS=y CONFIG_PAGE_POISONING=y