APPLIED[Disco]: [Unstable Eoan Disco][PATCH] UBUNTU: [Config] CONFIG_LOG_BUF_SHIFT=18 on all 64bit arches

[Kleber Souza]

On 4/23/19 3:46 PM, Dimitri John Ledkov wrote:
> BugLink: https://bugs.launchpad.net/bugs/1824864
> 
> Signed-off-by: Dimitri John Ledkov <xnox at ubuntu.com>

Applied to disco/master-next branch, with the same change made by Seth
for the unstable repo (with the text from the "Impact" section of
the bug description added to the commit message).

Thanks,
Kleber


> ---
> 
>  debian.master/config/annotations                   | 2 +-
>  debian.master/config/arm64/config.common.arm64     | 2 +-
>  debian.master/config/ppc64el/config.common.ppc64el | 2 +-
>  debian.master/config/s390x/config.common.s390x     | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index c81088822ad5..7221fcc92461 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -9770,7 +9770,7 @@ CONFIG_USELIB                                   policy<{'amd64': 'y', 'arm64': '
>  CONFIG_AUDIT                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_CPU_ISOLATION                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_IKCONFIG                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> -CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'ppc64el': '17', 's390x': '17'}>
> +CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '18', 'armhf': '17', 'i386': '17', 'ppc64el': '18', 's390x': '18'}>
>  CONFIG_LOG_CPU_MAX_BUF_SHIFT                    policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'ppc64el': '12', 's390x': '12'}>
>  CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT                policy<{'amd64': '13', 'arm64': '13', 'armhf': '13', 'i386': '13', 'ppc64el': '13', 's390x': '13'}>
>  CONFIG_NUMA_BALANCING                           policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index a1755e35eb33..06b0ea14f67a 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -293,7 +293,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  CONFIG_LOCK_DOWN_KERNEL=y
> -CONFIG_LOG_BUF_SHIFT=14
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MACB=m
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index 84b5b8a373dd..c36925e99c1a 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -274,7 +274,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MACB=m
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index bb9bec3de8ff..2a1804d1133e 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -260,7 +260,7 @@ CONFIG_KVM=y
>  # CONFIG_LIBNVDIMM is not set
>  # CONFIG_LLC2 is not set
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  # CONFIG_LPC_ICH is not set
>  # CONFIG_LPC_SCH is not set
>  # CONFIG_MACB is not set
>