diff -Nru tp-smapi-0.42/debian/changelog tp-smapi-0.43/debian/changelog
--- tp-smapi-0.42/debian/changelog	2017-01-11 22:59:30.000000000 +0000
+++ tp-smapi-0.43/debian/changelog	2018-02-24 16:35:54.000000000 +0000
@@ -1,9 +1,12 @@
-tp-smapi (0.42-1ubuntu1) zesty; urgency=medium
+tp-smapi (0.43-1) unstable; urgency=medium
 
-  * Drop hdaps modules build as it is now upstream as of linux v4.9
-    debian/patches/drop-hdaps.patch 
+  * New upstream version 0.43
+    + Support 4.15 kernel
+      Closes: #884973
+  * move to salsa.d.o
+  * Standards-Version: 4.1.3.0
 
- -- Tim Gardner <tim.gardner@canonical.com>  Wed, 11 Jan 2017 15:58:57 -0700
+ -- Evgeni Golov <evgeni@debian.org>  Sat, 24 Feb 2018 17:35:54 +0100
 
 tp-smapi (0.42-1) unstable; urgency=medium
 
diff -Nru tp-smapi-0.42/debian/control tp-smapi-0.43/debian/control
--- tp-smapi-0.42/debian/control	2017-01-11 22:59:37.000000000 +0000
+++ tp-smapi-0.43/debian/control	2018-02-24 16:12:20.000000000 +0000
@@ -1,14 +1,13 @@
 Source: tp-smapi
 Section: kernel
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Evgeni Golov <evgeni@debian.org>
+Maintainer: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: bzip2, dkms
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3.0
 Homepage: https://github.com/evgeni/tp_smapi/
-Vcs-Git: https://anonscm.debian.org/git/users/evgeni/tp-smapi.git
-Vcs-Browser: https://anonscm.debian.org/git/users/evgeni/tp-smapi.git
+Vcs-Git: https://salsa.debian.org/debian/tp-smapi.git
+Vcs-Browser: https://salsa.debian.org/debian/tp-smapi
 
 Package: tp-smapi-dkms
 Architecture: all
diff -Nru tp-smapi-0.42/debian/patches/drop-hdaps.patch tp-smapi-0.43/debian/patches/drop-hdaps.patch
--- tp-smapi-0.42/debian/patches/drop-hdaps.patch	2017-01-11 22:58:17.000000000 +0000
+++ tp-smapi-0.43/debian/patches/drop-hdaps.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-Description: Drop hdaps module build.
- The hdaps module is now part of linux v4.9.
- .
- tp-smapi (0.42-1) unstable; urgency=medium
- .
-   * Imported Upstream version 0.42
-     + builds fine against newer kernels (Closes: #820724)
-     + detects X200s as such (Closes: #735631)
-   * make the build reproducible (Closes: #778217)
-   * use upstream's dkms.conf
-   * stop patching upstreams Makefile, it should just work now
-   * use dh_dkms (Closes: #600803)
-   * update d/watch
-   * update Homepage
-   * do not build tp-smapi-source anymore
-   * dh rules!
-   * Standards-Version: 3.9.8
-   * add readme and sysfs.conf to dkms package
-   * update Vcs-*
-   * format 3.0 (quilt)
-Author: Evgeni Golov <evgeni@debian.org>
-Bug-Debian: https://bugs.debian.org/600803
-Bug-Debian: https://bugs.debian.org/735631
-Bug-Debian: https://bugs.debian.org/778217
-Bug-Debian: https://bugs.debian.org/820724
-
----
-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: <YYYY-MM-DD>
-
---- tp-smapi-0.42.orig/dkms.conf
-+++ tp-smapi-0.42/dkms.conf
-@@ -1,11 +1,9 @@
- PACKAGE_NAME="tp_smapi"
- PACKAGE_VERSION="0.42"
--MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build HDAPS=1"
-+MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build"
- CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
- BUILT_MODULE_NAME[0]="thinkpad_ec"
- BUILT_MODULE_NAME[1]="tp_smapi"
--BUILT_MODULE_NAME[2]="hdaps"
- DEST_MODULE_LOCATION[0]="/extra"
- DEST_MODULE_LOCATION[1]="/extra"
--DEST_MODULE_LOCATION[2]="/updates"
- AUTOINSTALL="yes"
diff -Nru tp-smapi-0.42/debian/patches/series tp-smapi-0.43/debian/patches/series
--- tp-smapi-0.42/debian/patches/series	2017-01-11 22:57:31.000000000 +0000
+++ tp-smapi-0.43/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-drop-hdaps.patch
diff -Nru tp-smapi-0.42/dkms.conf tp-smapi-0.43/dkms.conf
--- tp-smapi-0.42/dkms.conf	2016-04-23 17:44:19.000000000 +0000
+++ tp-smapi-0.43/dkms.conf	2018-02-24 15:59:51.000000000 +0000
@@ -1,5 +1,5 @@
 PACKAGE_NAME="tp_smapi"
-PACKAGE_VERSION="0.42"
+PACKAGE_VERSION="0.43"
 MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build HDAPS=1"
 CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
 BUILT_MODULE_NAME[0]="thinkpad_ec"
diff -Nru tp-smapi-0.42/hdaps.c tp-smapi-0.43/hdaps.c
--- tp-smapi-0.42/hdaps.c	2016-04-23 17:44:19.000000000 +0000
+++ tp-smapi-0.43/hdaps.c	2018-02-24 15:59:51.000000000 +0000
@@ -62,7 +62,7 @@
 
 #define HDAPS_INPUT_FUZZ	4	/* input event threshold */
 #define HDAPS_INPUT_FLAT	4
-#define KMACT_REMEMBER_PERIOD   (HZ/10) /* keyboard/mouse persistance */
+#define KMACT_REMEMBER_PERIOD   (HZ/10) /* keyboard/mouse persistence */
 
 /* Input IDs */
 #define HDAPS_INPUT_VENDOR	PCI_VENDOR_ID_IBM
@@ -469,7 +469,11 @@
 /* Timer handler for updating the input device. Runs in softirq context,
  * so avoid lenghty or blocking operations.
  */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
 static void hdaps_mousedev_poll(unsigned long unused)
+#else
+static void hdaps_mousedev_poll(struct timer_list *unused)
+#endif
 {
 	int ret;
 
@@ -735,7 +739,7 @@
    Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
    "ThinkPad T42p", and enumeration stops after first match,
    so the order of the entries matters. */
-struct dmi_system_id __initdata hdaps_whitelist[] = {
+struct dmi_system_id __initconst hdaps_whitelist[] = {
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_ORIENT_INVERT_XY),
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R60", HDAPS_ORIENT_INVERT_XY),
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p", HDAPS_ORIENT_INVERT_XY),
@@ -758,7 +762,8 @@
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T410", HDAPS_ORIENT_INVERT_XY),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T500", HDAPS_ORIENT_INVERT_XY),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T510", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_X | HDAPS_ORIENT_INVERT_Y),
-	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad W51O", HDAPS_ORIENT_MAX),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad W510", HDAPS_ORIENT_MAX),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad W520", HDAPS_ORIENT_MAX),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X200s", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_XY),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X200", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_X | HDAPS_ORIENT_INVERT_Y),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X201 Tablet", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_XY),
@@ -778,8 +783,12 @@
 			hdaps_invert = 0; /* default */
 
 	/* Init timer before platform_driver_register, in case of suspend */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
 	init_timer(&hdaps_timer);
 	hdaps_timer.function = hdaps_mousedev_poll;
+#else
+	timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
+#endif
 	ret = platform_driver_register(&hdaps_driver);
 	if (ret)
 		goto out;
diff -Nru tp-smapi-0.42/Makefile tp-smapi-0.43/Makefile
--- tp-smapi-0.42/Makefile	2016-04-23 17:44:19.000000000 +0000
+++ tp-smapi-0.43/Makefile	2018-02-24 15:59:51.000000000 +0000
@@ -89,7 +89,7 @@
 #####################################################################
 # Generate a stand-alone kernel patch
 
-TP_VER := 0.42
+TP_VER := 0.43
 ORG    := a
 NEW    := b
 PATCH  := tp_smapi-$(TP_VER)-for-$(KVER).patch
diff -Nru tp-smapi-0.42/README tp-smapi-0.43/README
--- tp-smapi-0.42/README	2016-04-23 17:44:19.000000000 +0000
+++ tp-smapi-0.43/README	2018-02-24 15:59:51.000000000 +0000
@@ -1,4 +1,4 @@
-tp_smapi version 0.42
+tp_smapi version 0.43
 IBM ThinkPad hardware functions driver
 
 Author:  Shem Multinymous <multinymous@gmail.com>
@@ -180,10 +180,18 @@
 * A30
 * G41
 * R40, R50p, R51, R52
-* T23, T40, T40p, T41, T41p, T42, T42p, T43, T43p, T60
-* X24, X31, X32, X40, X41, X60
+* T23, T40, T40p, T41, T41p, T42, T42p, T43, T43p, T60, T61, T400, T410, T420 (partially)
+* X24, X31, X32, X40, X41, X60, X61, X200, X201, X220 (partially)
 * Z60t, Z61m
 
+Does not work on:
+* X230 and newer
+* T430 and newer
+* Any ThinkPad Edge
+* Any ThinkPad Yoga
+* Any ThinkPad L series
+* Any ThinkPad P series
+
 Not all functions are available on all models; for detailed status, see:
   http://thinkwiki.org/wiki/tp_smapi
 
diff -Nru tp-smapi-0.42/thinkpad_ec.c tp-smapi-0.43/thinkpad_ec.c
--- tp-smapi-0.42/thinkpad_ec.c	2016-04-23 17:44:19.000000000 +0000
+++ tp-smapi-0.43/thinkpad_ec.c	2018-02-24 15:59:51.000000000 +0000
@@ -45,7 +45,7 @@
 	#include <linux/semaphore.h>
 #endif
 
-#define TP_VERSION "0.42"
+#define TP_VERSION "0.43"
 
 MODULE_AUTHOR("Shem Multinymous");
 MODULE_DESCRIPTION("ThinkPad embedded controller hardware access");
diff -Nru tp-smapi-0.42/tp_smapi.c tp-smapi-0.43/tp_smapi.c
--- tp-smapi-0.42/tp_smapi.c	2016-04-23 17:44:19.000000000 +0000
+++ tp-smapi-0.43/tp_smapi.c	2018-02-24 15:59:51.000000000 +0000
@@ -47,7 +47,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-#define TP_VERSION "0.42"
+#define TP_VERSION "0.43"
 #define TP_DESC "ThinkPad SMAPI Support"
 #define TP_DIR "smapi"
 
diff -Nru tp-smapi-0.42/tp_smapi.spec tp-smapi-0.43/tp_smapi.spec
--- tp-smapi-0.42/tp_smapi.spec	2016-04-23 17:44:19.000000000 +0000
+++ tp-smapi-0.43/tp_smapi.spec	2018-02-24 15:59:51.000000000 +0000
@@ -1,5 +1,5 @@
 %define module tp_smapi
-%define version 0.42
+%define version 0.43
 
 Name:           %{module}
 Version:        %{version}