Merge ~anthonywong/ubuntu/+source/kmod:ubuntu/devel into ubuntu/+source/kmod:ubuntu/devel

[Anthony Wong]

[Timo Aaltonen (tjaalton)]

Yep, it's time to remove this old workaround.

review: Approve

[Timo Aaltonen (tjaalton)]

I noticed it got removed for a while but added back due to regressions, but with latest kernels (on bionic/cosmic/disco) things work fine.

Unmerged commits

cf1fdbf... by Anthony Wong <email address hidden> on 2018-08-13

Remove i2c_i801 from blacklist.conf as it's needed by many machines (LP: #1786574)

73f4d14... by Julian Andres Klode on 2018-05-28

Import patches-unapplied version 25-1ubuntu1 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 80cdb91e3297b7b52b4a190b0396df73b6286178

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - Install ubuntu-specific depmod.d and modprobe.d contents.
    - Drop the alsa-base Breaks, our version is quite different.
    - On upgrade, remove obsolete rtc module from /etc/modules.
    - Fix rules to only build indep packages for binary-indep.
    - Remove /etc/modprobe.d/mlx4.conf: The kernel module mlx4_core
      will automatically load the mlx4_en/mlx4_ib modules (LP 1693503)
  * Dropped transitional module-init-tools package

80cdb91... by Marco d'Itri on 2018-01-21

Import patches-unapplied version 25-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e444da666fe984974d344da33c5d929b0837aeb4

New changelog entries:
  * New upstream release.
  * Enabled support for xz-compressed modules. (Closes: #772628)

e444da6... by Marco d'Itri on 2017-02-27

Import patches-unapplied version 24-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 06cc89a7e25efcf6f93cb9efaf67257cdd5d3045

New changelog entries:
  * New upstream release.

06cc89a... by Marco d'Itri on 2016-12-26

Import patches-unapplied version 23-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 49a04f9e2e2b05c37e181f56f5341bc6b9bf3314

New changelog entries:
  * Backported upstream commit 6b77f18 to stop depmod crashing after
    detecting a dependency cycle. (Closes: #846888)
  * Enabled hardening=+bindnow.

49a04f9... by Marco d'Itri on 2016-09-26

Import patches-unapplied version 23-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 15eeb98d4ccce42d28de3a5e76a034e315823372

New changelog entries:
  * New upstream release. (Closes: #837626)

15eeb98... by Marco d'Itri on 2015-12-20

Import patches-unapplied version 22-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 449558f6fb87241b281c672b91f552c45eeb1aef

New changelog entries:
  * New upstream release.
  * Set $SOURCE_DATE_EPOCH in debian/rules for reproducibility.
    (Closes: #783152)
  * Remove the module-init-tools transitional package.

449558f... by Marco d'Itri on 2015-07-05

Import patches-unapplied version 21-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 12a899058a58230e5131a59ab56f9b3f21d4774c

New changelog entries:
  * New upstream release. Fixes:
    + spurious spaces in lsmod output. (Closes: #782692)
    + a missing comman in rmmod(8). (Closes: #787548)
  * kmod.init: support the modules-load.d directories in /usr.
    (Closes: #673747)
  * Build the developers' documentation with gtk-doc. (Closes: #789462)

12a8990... by Marco d'Itri on 2015-03-08

Import patches-unapplied version 20-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 88882a923972791f5dfb2cb8fcd2836994bb8c50

New changelog entries:
  * New upstream release.

88882a9... by Marco d'Itri on 2014-09-27

Import patches-unapplied version 18-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ba20d16cb22c4c4440b114231a5c40f99caf36b8

New changelog entries:
  * postinst: do not use autodie. (Closes: #762974)
  * postinst: do not create an empty etc-modules-parameters.conf.

diff --git a/debian/modprobe.d/blacklist.conf b/debian/modprobe.d/blacklist.conf
index 08b3854..eecdf12 100644
--- a/debian/modprobe.d/blacklist.conf
+++ b/debian/modprobe.d/blacklist.conf
@@ -25,9 +25,6 @@ blacklist snd_intel8x0m
 # Conflicts with dvb driver (which is better for handling this device)
 blacklist snd_aw2
 
-# causes failure to suspend on HP compaq nc6000 (Ubuntu: #10306)
-blacklist i2c_i801
-
 # replaced by p54pci
 blacklist prism54