diff options
| author | Paolo Abeni <[email protected]> | 2025-03-13 22:01:29 +0000 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2025-03-13 22:08:11 +0000 |
| commit | 941defcea7e11ad7ff8f0d4856716dd637d757dd (patch) | |
| tree | b189ce7b72cdded5713ba5b410e87c922ce1b4ee /drivers/platform/x86/intel/hid.c | |
| parent | Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mel... (diff) | |
| parent | Merge tag 'net-6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-941defcea7e11ad7ff8f0d4856716dd637d757dd.tar.gz kernel-941defcea7e11ad7ff8f0d4856716dd637d757dd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc6).
Conflicts:
tools/testing/selftests/drivers/net/ping.py
75cc19c8ff89 ("selftests: drv-net: add xdp cases for ping.py")
de94e8697405 ("selftests: drv-net: store addresses in dict indexed by ipver")
https://lore.kernel.org/netdev/[email protected]/
net/core/devmem.c
a70f891e0fa0 ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()")
1d22d3060b9b ("net: drop rtnl_lock for queue_mgmt operations")
https://lore.kernel.org/netdev/[email protected]/
Adjacent changes:
tools/testing/selftests/net/Makefile
6f50175ccad4 ("selftests: Add IPv6 link-local address generation tests for GRE devices.")
2e5584e0f913 ("selftests/net: expand cmsg_ipv6.sh with ipv4")
drivers/net/ethernet/broadcom/bnxt/bnxt.c
661958552eda ("eth: bnxt: do not use BNXT_VNIC_NTUPLE unconditionally in queue restart logic")
fe96d717d38e ("bnxt_en: Extend queue stop/start for TX rings")
Signed-off-by: Paolo Abeni <[email protected]>
Diffstat (limited to 'drivers/platform/x86/intel/hid.c')
| -rw-r--r-- | drivers/platform/x86/intel/hid.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c index 927a2993f616..88a1a9ff2f34 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -139,6 +139,13 @@ static const struct dmi_system_id button_array_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 3"), }, }, + { + .ident = "Microsoft Surface Go 4", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 4"), + }, + }, { } }; |