| Message ID | 20230420191947.12021-1-michael.reed@canonical.com |
|---|---|
| Headers | show |
| Series | Backport request for hpwdt from upstream 6.1 to Jammy | expand |
On 20.04.23 21:19, Michael Reed wrote: > From: Michael Reed <Michael.Reed@canonical.com> > > SRU Justification: > > [Impact] > > Please pick up the latest hpwdt from the upstream 6.1 kernel for Jammy. This version enables hpwdt on RL300 aarch64. > > [Fix] > ed835d8171fc watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING > > 891862d5ba11 watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > > [Test Plan] > Boot system with the hpwdt enabled on an arm64 system > > [Where Problems Could Occur] > > Regression Risk is Low The intention of above is to give testers a hint (being part of the SRU justification in the bug report) how problems might be observed. Like watchdog related things happening on previously unsupported systems (might be good or bad). > > [Other Info] > Jammy > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/lp_2008751_hpwdt_1 > > Kinetic > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/kinetic/+ref/lp_2008751_hpwdt_kinetic_1 > > Jerry Hoemann (2): > watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING > > Michael Reed (1): > UBUNTU: [Config] Add arm64 option to CONFIG_HP_WATCHDOG > This part is a little odd to me. There are the patches included in the thread and from a first look the impression is that those are the same for Jammy and Kinetic (btw, maybe we want to change the bug report title to either drop "to Jammy" or add "/Kinetic"). But then you also provide 2 repos to pull from. Which only would be necessary if things are different. Cause when you submit a pull request then we would do what the standard text indicates: fetch the branch and then only export (format-patch) the range of changes given. And then apply it (git am). So just as future hint: if you ever have larger sets which are different across series, I would probably do a manual cover email and then pull requests by series as follow ups. Here with just 3 patches which are included, it feels like having the repositories per series mention might cause more confusion than it helps. > debian.master/config/annotations | 2 +- > drivers/watchdog/Kconfig | 4 ++-- > drivers/watchdog/hpwdt.c | 2 ++ > 3 files changed, 5 insertions(+), 3 deletions(-) >
On 20.04.23 21:19, Michael Reed wrote: > From: Michael Reed <Michael.Reed@canonical.com> > > SRU Justification: > > [Impact] > > Please pick up the latest hpwdt from the upstream 6.1 kernel for Jammy. This version enables hpwdt on RL300 aarch64. > > [Fix] > ed835d8171fc watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING > > 891862d5ba11 watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > > [Test Plan] > Boot system with the hpwdt enabled on an arm64 system > > [Where Problems Could Occur] > > Regression Risk is Low > > [Other Info] > Jammy > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/lp_2008751_hpwdt_1 > > Kinetic > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/kinetic/+ref/lp_2008751_hpwdt_kinetic_1 > > Jerry Hoemann (2): > watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING > > Michael Reed (1): > UBUNTU: [Config] Add arm64 option to CONFIG_HP_WATCHDOG > > debian.master/config/annotations | 2 +- > drivers/watchdog/Kconfig | 4 ++-- > drivers/watchdog/hpwdt.c | 2 ++ > 3 files changed, 5 insertions(+), 3 deletions(-) > Potentially with some slight modifications mentioned in other replies: Acked-by: Stefan Bader <stefan.bader@canonical.com>
On 23/04/20 02:19PM, Michael Reed wrote: > From: Michael Reed <Michael.Reed@canonical.com> > > SRU Justification: > > [Impact] > > Please pick up the latest hpwdt from the upstream 6.1 kernel for Jammy. This version enables hpwdt on RL300 aarch64. > > [Fix] > ed835d8171fc watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING > > 891862d5ba11 watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > > [Test Plan] > Boot system with the hpwdt enabled on an arm64 system > > [Where Problems Could Occur] > > Regression Risk is Low > > [Other Info] > Jammy > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/lp_2008751_hpwdt_1 > > Kinetic > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/kinetic/+ref/lp_2008751_hpwdt_kinetic_1 > > Jerry Hoemann (2): > watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING > > Michael Reed (1): > UBUNTU: [Config] Add arm64 option to CONFIG_HP_WATCHDOG > > debian.master/config/annotations | 2 +- > drivers/watchdog/Kconfig | 4 ++-- > drivers/watchdog/hpwdt.c | 2 ++ > 3 files changed, 5 insertions(+), 3 deletions(-) > > -- > 2.34.1 Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com>
Applied to jammy linux master-next, ported the config changes to the new annotation model and verified the module gets built. Applied to kinetic:linux master-next and also verified the module gets built. Thanks! - Luke On Thu, Apr 20, 2023 at 9:20 PM Michael Reed <michael.reed@canonical.com> wrote: > From: Michael Reed <Michael.Reed@canonical.com> > > SRU Justification: > > [Impact] > > Please pick up the latest hpwdt from the upstream 6.1 kernel for Jammy. > This version enables hpwdt on RL300 aarch64. > > [Fix] > ed835d8171fc watchdog/hpwdt: Include nmi.h only if > CONFIG_HPWDT_NMI_DECODING > > 891862d5ba11 watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > > [Test Plan] > Boot system with the hpwdt enabled on an arm64 system > > [Where Problems Could Occur] > > Regression Risk is Low > > [Other Info] > Jammy > > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/lp_2008751_hpwdt_1 > > Kinetic > > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/kinetic/+ref/lp_2008751_hpwdt_kinetic_1 > > Jerry Hoemann (2): > watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. > watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING > > Michael Reed (1): > UBUNTU: [Config] Add arm64 option to CONFIG_HP_WATCHDOG > > debian.master/config/annotations | 2 +- > drivers/watchdog/Kconfig | 4 ++-- > drivers/watchdog/hpwdt.c | 2 ++ > 3 files changed, 5 insertions(+), 3 deletions(-) > > -- > 2.34.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team >
From: Michael Reed <Michael.Reed@canonical.com> SRU Justification: [Impact] Please pick up the latest hpwdt from the upstream 6.1 kernel for Jammy. This version enables hpwdt on RL300 aarch64. [Fix] ed835d8171fc watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING 891862d5ba11 watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. [Test Plan] Boot system with the hpwdt enabled on an arm64 system [Where Problems Could Occur] Regression Risk is Low [Other Info] Jammy https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/lp_2008751_hpwdt_1 Kinetic https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/kinetic/+ref/lp_2008751_hpwdt_kinetic_1 Jerry Hoemann (2): watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING Michael Reed (1): UBUNTU: [Config] Add arm64 option to CONFIG_HP_WATCHDOG debian.master/config/annotations | 2 +- drivers/watchdog/Kconfig | 4 ++-- drivers/watchdog/hpwdt.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-)