| Message ID | 20230420191947.12021-3-michael.reed@canonical.com |
|---|---|
| State | New |
| 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> > > BugLink: https://bugs.launchpad.net/bugs/2008751 > > CONFIG_HP_WATCHDOG is used in module hpwdt. A software monitoring watchdog > and NMI handling driver. This driver will detect lockups and provide > a stack trace. This is a driver that will only load on an HP ProLiant > system with a minimum of iLO2 support. This option allow it to build > on arm64. > > Signed-off-by: Michael Reed <Michael.Reed@canonical.com> > --- > debian.master/config/annotations | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Does this really work? In J/K the annotations are just used for checks (and even those not necessarily enforce things. It might be ok as the arm64 side could have been unreachable and thus the option being part of config.common.ubuntu. This seems to be the case. So I guess it is ok. Would just be better if the change mentioned that it is already part of the config.common.ubuntu. What I probably also would do is to re-order the config change to be the last of the set. > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index a531e19a9288..480a7073f0c1 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -10465,7 +10465,7 @@ CONFIG_ITCO_WDT policy<{'amd64': 'm'}> > CONFIG_ITCO_VENDOR_SUPPORT policy<{'amd64': 'y'}> > CONFIG_IT8712F_WDT policy<{'amd64': 'm'}> > CONFIG_IT87_WDT policy<{'amd64': 'm'}> > -CONFIG_HP_WATCHDOG policy<{'amd64': 'm'}> > +CONFIG_HP_WATCHDOG policy<{'amd64': 'm', 'arm64': 'm'}> > CONFIG_HPWDT_NMI_DECODING policy<{'amd64': 'y'}> > CONFIG_KEMPLD_WDT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> > CONFIG_SC1200_WDT policy<{'amd64': 'm'}>
diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a531e19a9288..480a7073f0c1 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -10465,7 +10465,7 @@ CONFIG_ITCO_WDT policy<{'amd64': 'm'}> CONFIG_ITCO_VENDOR_SUPPORT policy<{'amd64': 'y'}> CONFIG_IT8712F_WDT policy<{'amd64': 'm'}> CONFIG_IT87_WDT policy<{'amd64': 'm'}> -CONFIG_HP_WATCHDOG policy<{'amd64': 'm'}> +CONFIG_HP_WATCHDOG policy<{'amd64': 'm', 'arm64': 'm'}> CONFIG_HPWDT_NMI_DECODING policy<{'amd64': 'y'}> CONFIG_KEMPLD_WDT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> CONFIG_SC1200_WDT policy<{'amd64': 'm'}>