diff -Nru kmod-24/debian/changelog kmod-24/debian/changelog
--- kmod-24/debian/changelog	2017-08-15 18:36:19.000000000 +0000
+++ kmod-24/debian/changelog	2018-01-28 15:34:49.000000000 +0000
@@ -1,3 +1,10 @@
+kmod (24-1ubuntu3) bionic; urgency=medium
+
+  * Remove /etc/modprobe.d/mlx4.conf: The kernel module mlx4_core will
+    automatically load the mlx4_en/mlx4_ib modules (LP: #1693503)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 28 Jan 2018 16:34:49 +0100
+
 kmod (24-1ubuntu2) artful; urgency=medium
 
   * Drop upstart job.
diff -Nru kmod-24/debian/kmod.postinst kmod-24/debian/kmod.postinst
--- kmod-24/debian/kmod.postinst	2017-02-27 09:44:27.000000000 +0000
+++ kmod-24/debian/kmod.postinst	2017-12-27 10:16:20.000000000 +0000
@@ -65,6 +65,8 @@
   fi
 esac
 
+dpkg-maintscript-helper rm_conffile /etc/modprobe.d/mlx4.conf 24-1ubuntu2 kmod -- "$@"
+
 #DEBHELPER#
 
 exit 0
diff -Nru kmod-24/debian/kmod.postrm kmod-24/debian/kmod.postrm
--- kmod-24/debian/kmod.postrm	2017-02-27 09:44:27.000000000 +0000
+++ kmod-24/debian/kmod.postrm	2017-12-27 10:16:54.000000000 +0000
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+dpkg-maintscript-helper rm_conffile /etc/modprobe.d/mlx4.conf 24-1ubuntu2 kmod -- "$@"
+
 case "$1" in
   purge)
   rm -f /etc/modules
diff -Nru kmod-24/debian/kmod.preinst kmod-24/debian/kmod.preinst
--- kmod-24/debian/kmod.preinst	1970-01-01 00:00:00.000000000 +0000
+++ kmod-24/debian/kmod.preinst	2017-12-27 10:17:20.000000000 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/modprobe.d/mlx4.conf 24-1ubuntu2 kmod -- "$@"
+
+#DEBHELPER#
diff -Nru kmod-24/debian/modprobe.d/mlx4.conf kmod-24/debian/modprobe.d/mlx4.conf
--- kmod-24/debian/modprobe.d/mlx4.conf	2015-08-20 11:41:58.000000000 +0000
+++ kmod-24/debian/modprobe.d/mlx4.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# mlx4_core gets automatically loaded, load mlx4_en also (LP: #1115710)
-softdep mlx4_core post: mlx4_en
diff -Nru kmod-24/debian/rules kmod-24/debian/rules
--- kmod-24/debian/rules	2017-04-28 13:19:16.000000000 +0000
+++ kmod-24/debian/rules	2017-12-27 10:12:25.000000000 +0000
@@ -113,7 +113,6 @@
 	cd build-udeb/ && \
 	$(MAKE) install-exec DESTDIR=$(DKU)
 	install --mode=755 -d $(DKU)/etc/modprobe.d
-	install --mode=644 -t $(DKU)/etc/modprobe.d debian/modprobe.d/mlx4.conf
 	rm -r $(DKU)/lib/
 
 	egrep -i '^[a-z]' extra/aliases.conf > $(DKU)/etc/modprobe.d/aliases.conf