From 307d2509a911819be33adf40c7aea5c71bd3c053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Santamar=C3=ADa=20Rogado?= <howl.nsp@gmail.com>
Date: Tue, 27 Jan 2026 00:16:40 +0100
Subject: [PATCH] quirks: merge ibm with lenovo

ScrollPoint mouses as well IBM USB Travel Keyboard with Ultra Nav Mouse
are owned by Lenovo.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1419>
---
 quirks/30-vendor-ibm.quirks    | 47 ----------------------------------
 quirks/50-system-lenovo.quirks | 46 +++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 47 deletions(-)
 delete mode 100644 quirks/30-vendor-ibm.quirks

diff --git a/quirks/30-vendor-ibm.quirks b/quirks/30-vendor-ibm.quirks
deleted file mode 100644
index 9990205b..00000000
--- a/quirks/30-vendor-ibm.quirks
+++ /dev/null
@@ -1,47 +0,0 @@
-# Do not edit this file, it will be overwritten on update
-
-# IBM/Lenovo Scrollpoint mouse. Instead of a scroll wheel these mice
-# feature trackpoint-like sticks which generate a huge amount of scroll
-# events that need to be handled differently than scroll wheel events
-
-[IBM ScrollPoint Mouse 3100]
-MatchUdevType=mouse
-MatchVendor=0x04B3
-MatchProduct=0x3100
-ModelLenovoScrollPoint=1
-
-[IBM ScrollPoint Mouse 3103]
-MatchUdevType=mouse
-MatchVendor=0x04B3
-MatchProduct=0x3103
-ModelLenovoScrollPoint=1
-
-[IBM ScrollPoint Mouse 3105]
-MatchUdevType=mouse
-MatchVendor=0x04B3
-MatchProduct=0x3105
-ModelLenovoScrollPoint=1
-
-[IBM ScrollPoint Mouse 3108]
-MatchUdevType=mouse
-MatchVendor=0x04B3
-MatchProduct=0x3108
-ModelLenovoScrollPoint=1
-
-[IBM ScrollPoint Mouse 3109]
-MatchUdevType=mouse
-MatchVendor=0x04B3
-MatchProduct=0x3109
-ModelLenovoScrollPoint=1
-
-[IBM ScrollPoint Mouse 6049]
-MatchUdevType=mouse
-MatchVendor=0x17EF
-MatchProduct=0x6049
-ModelLenovoScrollPoint=1
-
-[IBM USB Travel Keyboard with Ultra Nav Mouse]
-MatchUdevType=pointingstick
-MatchVendor=0x04B3
-MatchProduct=0x301E
-AttrTrackpointMultiplier=1.50
diff --git a/quirks/50-system-lenovo.quirks b/quirks/50-system-lenovo.quirks
index 00365321..dd1273e9 100644
--- a/quirks/50-system-lenovo.quirks
+++ b/quirks/50-system-lenovo.quirks
@@ -245,6 +245,52 @@ MatchVendor=0x17EF
 MatchProduct=0x6047
 AttrPointingStickIntegration=external
 
+# IBM/Lenovo Scrollpoint mouse. Instead of a scroll wheel these mice
+# feature trackpoint-like sticks which generate a huge amount of scroll
+# events that need to be handled differently than scroll wheel events
+
+[IBM ScrollPoint Mouse 3100]
+MatchUdevType=mouse
+MatchVendor=0x04B3
+MatchProduct=0x3100
+ModelLenovoScrollPoint=1
+
+[IBM ScrollPoint Mouse 3103]
+MatchUdevType=mouse
+MatchVendor=0x04B3
+MatchProduct=0x3103
+ModelLenovoScrollPoint=1
+
+[IBM ScrollPoint Mouse 3105]
+MatchUdevType=mouse
+MatchVendor=0x04B3
+MatchProduct=0x3105
+ModelLenovoScrollPoint=1
+
+[IBM ScrollPoint Mouse 3108]
+MatchUdevType=mouse
+MatchVendor=0x04B3
+MatchProduct=0x3108
+ModelLenovoScrollPoint=1
+
+[IBM ScrollPoint Mouse 3109]
+MatchUdevType=mouse
+MatchVendor=0x04B3
+MatchProduct=0x3109
+ModelLenovoScrollPoint=1
+
+[Lenovo ScrollPoint Mouse 6049]
+MatchUdevType=mouse
+MatchVendor=0x17EF
+MatchProduct=0x6049
+ModelLenovoScrollPoint=1
+
+[IBM USB Travel Keyboard with Ultra Nav Mouse]
+MatchUdevType=pointingstick
+MatchVendor=0x04B3
+MatchProduct=0x301E
+AttrTrackpointMultiplier=1.50
+
 # The following ones correspond to detachable keyboard+touchpad combos used in
 # Lenovo detachable devices. Names can vary within the same ids and some are
 # repeated over different devices. They're mostly connected over USB bus through