From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752186AbcELGer (ORCPT ); Thu, 12 May 2016 02:34:47 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:36378 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbcELGep (ORCPT ); Thu, 12 May 2016 02:34:45 -0400 MIME-Version: 1.0 In-Reply-To: <1462969128-4070058-1-git-send-email-arnd@arndb.de> References: <1462969128-4070058-1-git-send-email-arnd@arndb.de> From: Joel Stanley Date: Thu, 12 May 2016 16:04:24 +0930 X-Google-Sender-Auth: fVXxHQn9MX-stgxGnY4k3hr8ovQ Message-ID: Subject: Re: [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 11, 2016 at 9:48 PM, Arnd Bergmann wrote: > 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. Thanks Arnd. Acked-by: Joel Stanley > > arch/arm/configs/aspeed_g4_defconfig | 2 +- > arch/arm/configs/aspeed_g5_defconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > 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 > -- > 2.7.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: joel@jms.id.au (Joel Stanley) Date: Thu, 12 May 2016 16:04:24 +0930 Subject: [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME In-Reply-To: <1462969128-4070058-1-git-send-email-arnd@arndb.de> References: <1462969128-4070058-1-git-send-email-arnd@arndb.de> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, May 11, 2016 at 9:48 PM, Arnd Bergmann wrote: > 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. Thanks Arnd. Acked-by: Joel Stanley > > arch/arm/configs/aspeed_g4_defconfig | 2 +- > arch/arm/configs/aspeed_g5_defconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > 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 > -- > 2.7.0 >