Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 libinput (1.10.6-1) unstable; urgency=medium
 .
   * New upstream release.
Author: Timo Aaltonen <tjaalton@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2018-05-15

--- libinput-1.10.6.orig/src/evdev-debounce.c
+++ libinput-1.10.6/src/evdev-debounce.c
@@ -569,7 +569,7 @@ fallback_init_debounce(struct fallback_d
 	char timer_name[64];
 
 	if (device->model_flags &
-	    (EVDEV_MODEL_MS_NANO_TRANSCEIVER|EVDEV_MODEL_LOGITECH_K400)) {
+	    (EVDEV_MODEL_MS_NANO_TRANSCEIVER|EVDEV_MODEL_LOGITECH_K400|EVDEV_MODEL_LOGITECH_KBTP)) {
 		dispatch->debounce.state = DEBOUNCE_STATE_DISABLED;
 		return;
 	}
--- libinput-1.10.6.orig/src/evdev.c
+++ libinput-1.10.6/src/evdev.c
@@ -1258,6 +1258,7 @@ evdev_read_model_flags(struct evdev_devi
 		MODEL(SYNAPTICS_SERIAL_TOUCHPAD),
 		MODEL(JUMPING_SEMI_MT),
 		MODEL(LOGITECH_K400),
+		MODEL(LOGITECH_KBTP),
 		MODEL(CYBORG_RAT),
 		MODEL(HP_STREAM11_TOUCHPAD),
 		MODEL(LENOVO_T450_TOUCHPAD),
--- libinput-1.10.6.orig/src/evdev.h
+++ libinput-1.10.6/src/evdev.h
@@ -128,6 +128,7 @@ enum evdev_device_model {
 	EVDEV_MODEL_TABLET_NO_PROXIMITY_OUT = (1 << 27),
 	EVDEV_MODEL_MS_NANO_TRANSCEIVER = (1 << 28),
 	EVDEV_MODEL_TABLET_MODE_NO_SUSPEND = (1 << 30),
+	EVDEV_MODEL_LOGITECH_KBTP = (1 << 31),
 };
 
 enum evdev_button_scroll_state {
--- libinput-1.10.6.orig/udev/90-libinput-model-quirks.hwdb
+++ libinput-1.10.6/udev/90-libinput-model-quirks.hwdb
@@ -257,6 +257,10 @@ libinput:mouse:input:b0003v046DpC408*
 libinput:mouse:input:b0003v046Dp4024*
  LIBINPUT_MODEL_LOGITECH_K400=1
 
+# Logitech Keyboard Touchpad Combo
+libinput:mouse:input:b0003v046Dp404*
+ LIBINPUT_MODEL_LOGITECH_KBTP=1
+
 ##########################################
 # Microsoft
 ##########################################