<div dir="ltr"><div>Applied to jammy linux master-next, ported the config changes to the new annotation model and verified the module gets built.</div><div><br></div><div>Applied to kinetic:linux master-next and also verified the module gets built. <br></div><div><br></div><div>Thanks!</div><div>- Luke<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Apr 20, 2023 at 9:20 PM Michael Reed <<a href="mailto:michael.reed@canonical.com">michael.reed@canonical.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Michael Reed <<a href="mailto:Michael.Reed@canonical.com" target="_blank">Michael.Reed@canonical.com</a>><br>
<br>
SRU Justification:<br>
<br>
[Impact]<br>
<br>
Please pick up the latest hpwdt from the upstream 6.1 kernel for Jammy. This version enables hpwdt on RL300 aarch64.<br>
<br>
[Fix]<br>
ed835d8171fc watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING<br>
<br>
891862d5ba11 watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems.<br>
<br>
[Test Plan]<br>
Boot system with the hpwdt enabled on an arm64 system<br>
<br>
[Where Problems Could Occur]<br>
<br>
Regression Risk is Low<br>
<br>
[Other Info]<br>
Jammy<br>
<a href="https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/lp_2008751_hpwdt_1" rel="noreferrer" target="_blank">https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/lp_2008751_hpwdt_1</a><br>
<br>
Kinetic<br>
<a href="https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/kinetic/+ref/lp_2008751_hpwdt_kinetic_1" rel="noreferrer" target="_blank">https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/kinetic/+ref/lp_2008751_hpwdt_kinetic_1</a><br>
<br>
Jerry Hoemann (2):<br>
  watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems.<br>
  watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING<br>
<br>
Michael Reed (1):<br>
  UBUNTU: [Config] Add arm64 option to CONFIG_HP_WATCHDOG<br>
<br>
 debian.master/config/annotations | 2 +-<br>
 drivers/watchdog/Kconfig         | 4 ++--<br>
 drivers/watchdog/hpwdt.c         | 2 ++<br>
 3 files changed, 5 insertions(+), 3 deletions(-)<br>
<br>
-- <br>
2.34.1<br>
<br>
<br>
-- <br>
kernel-team mailing list<br>
<a href="mailto:kernel-team@lists.ubuntu.com" target="_blank">kernel-team@lists.ubuntu.com</a><br>
<a href="https://lists.ubuntu.com/mailman/listinfo/kernel-team" rel="noreferrer" target="_blank">https://lists.ubuntu.com/mailman/listinfo/kernel-team</a><br>
</blockquote></div></div>