Merge ~os369510/ubuntu/+source/systemd:ubuntu-impish into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-impish

[jeremyszu]

Same story from lp1955997, some HP machines are using intel-hid instead
of HPQ6001. Thus, add them in the allowing list.
Specify the dmi string precisely to prevent introduce the regression.

Below launchpad tickets could be reference:
from 1966170:
pnHPProBook44014inchG9NotebookPC
pnHPProBook45015.6inchG9NotebookPC

from 1965898:
pnHPElitex36083013inchG92-in-1NotebookPC

from 1966014:
pnHPEliteBook104014inchG9NotebookPC
pnHPEliteBook84014inchG9NotebookPC
pnHPElitex360104014inchG92-in-1NotebookPC
pnHPEliteBook86016inchG9NotebookPC

from 1964913:
pnHPEliteBook64014inchG9NotebookPC
pnHPEliteBook65015.6inchG9NotebookPC

In the mail from HP (please see the lp1966179), HP also confirmed the
previous two platforms' dmi string need to adjust.
pnHPZBookFury16G9MobileWorkstationPC
pnHPZBookStudio16inchG9MobileWorkstationPC

[Julian Andres Klode (juliank)]

review: Abstain

4f2b260... by jeremyszu on 2022-04-21

Add 630/830 13 inch dmi string

[Lukas Märdian (slyon)]

LGTM overall. we're re-using the allow-list introduced in LP: #1955997 that only affects HP machines, so I consider this a low rist change.

I've combined your two top commits into a single one, mentioning the LP: #1966179 bug number, so it shows up correctly in the debian/changelog.

review: Approve

diff --git a/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch b/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch
new file mode 100644
index 0000000..20842cd
--- /dev/null
+++ b/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch
@@ -0,0 +1,64 @@
+From: Jeremy Szu <[e-mail]>
+Date: Mon, 4 Apr 2022 18:19:44 +0000
+Subject: lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event
+
+Same story from lp1955997, some HP machines are using intel-hid instead
+of HPQ6001. Thus, add them in the allowing list.
+Specify the dmi string precisely to prevent introduce the regression.
+
+Below launchpad tickets could be reference:
+from 1966170:
+pnHPProBook44014inchG9NotebookPC
+pnHPProBook45015.6inchG9NotebookPC
+
+from 1965898:
+pnHPElitex36083013inchG92-in-1NotebookPC
+
+from 1966014:
+pnHPEliteBook104014inchG9NotebookPC
+pnHPEliteBook84014inchG9NotebookPC
+pnHPElitex360104014inchG92-in-1NotebookPC
+pnHPEliteBook86016inchG9NotebookPC
+
+from 1964913:
+pnHPEliteBook64014inchG9NotebookPC
+pnHPEliteBook65015.6inchG9NotebookPC
+
+In the mail from HP (please see the lp1966179), HP also confirmed the
+previous two platforms' dmi string need to adjust.
+pnHPZBookFury16G9MobileWorkstationPC
+pnHPZBookStudio16inchG9MobileWorkstationPC
+
+In the MM channel from BillYu and AndyChi, for Thanos13 and Warpath13
+pnHPEliteBook83013inchG9NotebookPC
+pnHPEliteBook63013inchG9NotebookPC
+---
+ hwdb.d/60-keyboard.hwdb | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
+index 665721f..ea0ca56 100644
+--- a/hwdb.d/60-keyboard.hwdb
++++ b/hwdb.d/60-keyboard.hwdb
+@@ -502,8 +502,19 @@ evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pn*:*
+  KEYBOARD_KEY_8=unknown                                 # Use hp-wireless instead
+ 
+ # The allowlist to unblock intel-hid on HP machines.
+-evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookFury16inchG9MobileWorkstationPC:pvr*
+-evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookStudio16.0InchMobileWorkstationPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookFury16G9MobileWorkstationPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookStudio16inchG9MobileWorkstationPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook44014inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook45015.6inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElitex36083013inchG92-in-1NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook104014inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook84014inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElitex360104014inchG92-in-1NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook86016inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook64014inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook65015.6inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook83013inchG9NotebookPC:pvr*
++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook63013inchG9NotebookPC:pvr*
+  KEYBOARD_KEY_8=wlan
+ 
+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*:*
diff --git a/debian/patches/series b/debian/patches/series
index 11563f4..c41d5ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -77,3 +77,4 @@ CVE-2021-3997-3.patch
 lp1955997-add-a-allowlist-to-unblock-intel-hid-on-HP-mach.patch
 pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
 debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch
+lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch