ACK/cmnt: [PATCH Artful/Bionic/Unstable] UBUNTU: [Config]: Set PANIC_TIMEOUT=10 on ppc64el

Stefan Bader stefan.bader at canonical.com
Fri Nov 17 14:13:55 UTC 2017 

On 16.11.2017 12:15, Thadeu Lima de Souza Cascardo wrote:
> BugLink: https://bugs.launchpad.net/bugs/1730660
> 
> When stopping CPUS fail when doing kdump, the system will hang
> indefinitively, instead of rebooting. Using the default value of 10 for
> PANIC_TIMEOUT that we had for trusty allows the system to reboot.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>

> ---

Only have not accepted nomination for Bionic as that is devel and normally that
is implied by the main task. Actually don't now when one would do one or the
other (or maybe forgot).

-Stefan

>  debian.master/config/amd64/config.common.amd64     | 1 +
>  debian.master/config/annotations                   | 2 +-
>  debian.master/config/arm64/config.common.arm64     | 1 +
>  debian.master/config/armhf/config.common.armhf     | 1 +
>  debian.master/config/config.common.ubuntu          | 1 -
>  debian.master/config/i386/config.common.i386       | 1 +
>  debian.master/config/ppc64el/config.common.ppc64el | 1 +
>  debian.master/config/s390x/config.common.s390x     | 1 +
>  8 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 6c4f9a96ce3f..6df8bcf72690 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -293,6 +293,7 @@ CONFIG_OMFS_FS=m
>  CONFIG_OSF_PARTITION=y
>  CONFIG_OUTPUT_FORMAT="elf64-x86-64"
>  # CONFIG_PAGE_EXTENSION is not set
> +CONFIG_PANIC_TIMEOUT=0
>  CONFIG_PARAVIRT=y
>  CONFIG_PARPORT=m
>  CONFIG_PATA_SIS=y
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 254a059eebeb..37a06081fc75 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -9033,7 +9033,7 @@ CONFIG_MAGIC_SYSRQ                              policy<{'amd64': 'y', 'arm64': '
>  CONFIG_MAGIC_SYSRQ_SERIAL                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_KCOV                                     policy<{'amd64': 'n', 'arm64': 'n', 's390x': 'n'}>
>  CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> -CONFIG_PANIC_TIMEOUT                            policy<{'amd64': '0', 'arm64': '0', 'armhf': '0', 'i386': '0', 'ppc64el': '0', 's390x': '0'}>
> +CONFIG_PANIC_TIMEOUT                            policy<{'amd64': '0', 'arm64': '0', 'armhf': '0', 'i386': '0', 'ppc64el': '10', 's390x': '0'}>
>  CONFIG_DEBUG_TIMEKEEPING                        policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
>  CONFIG_STACKTRACE                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_WARN_ALL_UNSEEDED_RANDOM                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index 6578741d22db..9567d71e5cc7 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -310,6 +310,7 @@ CONFIG_OF=y
>  CONFIG_OMFS_FS=m
>  CONFIG_OSF_PARTITION=y
>  # CONFIG_PAGE_EXTENSION is not set
> +CONFIG_PANIC_TIMEOUT=0
>  CONFIG_PARAVIRT=y
>  CONFIG_PARPORT=m
>  CONFIG_PATA_SIS=m
> diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
> index e9bba2b31788..a817b043fe98 100644
> --- a/debian.master/config/armhf/config.common.armhf
> +++ b/debian.master/config/armhf/config.common.armhf
> @@ -290,6 +290,7 @@ CONFIG_OMFS_FS=m
>  CONFIG_OSF_PARTITION=y
>  CONFIG_PAGE_EXTENSION=y
>  CONFIG_PAGE_OFFSET=0xC0000000
> +CONFIG_PANIC_TIMEOUT=0
>  # CONFIG_PARAVIRT is not set
>  CONFIG_PARPORT=m
>  CONFIG_PATA_SIS=m
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 7ad590d311f0..8376d628211e 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -6209,7 +6209,6 @@ CONFIG_PANEL_PARPORT=0
>  CONFIG_PANEL_PROFILE=5
>  # CONFIG_PANIC_ON_OOPS is not set
>  CONFIG_PANIC_ON_OOPS_VALUE=0
> -CONFIG_PANIC_TIMEOUT=0
>  CONFIG_PANTHERLORD_FF=y
>  CONFIG_PARAVIRT_CLOCK=y
>  # CONFIG_PARAVIRT_DEBUG is not set
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 812e2d6c2bcd..eb973e0eb199 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -285,6 +285,7 @@ CONFIG_OSF_PARTITION=y
>  CONFIG_OUTPUT_FORMAT="elf32-i386"
>  CONFIG_PAGE_EXTENSION=y
>  CONFIG_PAGE_OFFSET=0xC0000000
> +CONFIG_PANIC_TIMEOUT=0
>  CONFIG_PARAVIRT=y
>  CONFIG_PARPORT=m
>  CONFIG_PATA_SIS=y
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index c4cee2d7fa70..6e9119f14165 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -295,6 +295,7 @@ CONFIG_OMFS_FS=m
>  CONFIG_OSF_PARTITION=y
>  # CONFIG_PAGE_EXTENSION is not set
>  CONFIG_PAGE_OFFSET=0xc000000000000000
> +CONFIG_PANIC_TIMEOUT=10
>  CONFIG_PARPORT=m
>  CONFIG_PATA_SIS=m
>  CONFIG_PC104=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index e18ae6cbd82e..767e65157c3d 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -253,6 +253,7 @@ CONFIG_NUMA_EMU=y
>  # CONFIG_OMFS_FS is not set
>  # CONFIG_OSF_PARTITION is not set
>  # CONFIG_PAGE_EXTENSION is not set
> +CONFIG_PANIC_TIMEOUT=0
>  # CONFIG_PARPORT is not set
>  # CONFIG_PC104 is not set
>  CONFIG_PCIEPORTBUS=y
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20171117/d403d330/attachment.sig>

More information about the kernel-team mailing list