* [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
@ 2016-05-11 12:18 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-05-11 12:18 UTC (permalink / raw)
To: Joel Stanley; +Cc: Arnd Bergmann, linux-arm-kernel, linux-kernel
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 <arnd@arndb.de>
---
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
@ 2016-05-11 12:18 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-05-11 12:18 UTC (permalink / raw)
To: linux-arm-kernel
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 <arnd@arndb.de>
---
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
2016-05-11 12:18 ` Arnd Bergmann
@ 2016-05-12 6:34 ` Joel Stanley
-1 siblings, 0 replies; 4+ messages in thread
From: Joel Stanley @ 2016-05-12 6:34 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel, linux-kernel
On Wed, May 11, 2016 at 9:48 PM, Arnd Bergmann <arnd@arndb.de> 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 <arnd@arndb.de>
> ---
> 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 <joel@jms.id.au>
>
> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
@ 2016-05-12 6:34 ` Joel Stanley
0 siblings, 0 replies; 4+ messages in thread
From: Joel Stanley @ 2016-05-12 6:34 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 11, 2016 at 9:48 PM, Arnd Bergmann <arnd@arndb.de> 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 <arnd@arndb.de>
> ---
> 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 <joel@jms.id.au>
>
> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-12 6:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-11 12:18 [PATCH] ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME Arnd Bergmann
2016-05-11 12:18 ` Arnd Bergmann
2016-05-12 6:34 ` Joel Stanley
2016-05-12 6:34 ` Joel Stanley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.