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

Proposed by Anthony Wong on 2018-08-13
Status: Needs review
Proposed branch: ~anthonywong/ubuntu/+source/kmod:ubuntu/devel
Merge into: ubuntu/+source/kmod:ubuntu/devel
Diff against target: 13 lines (+0/-3)
1 file modified
debian/modprobe.d/blacklist.conf (+0/-3)
Reviewer Review Type Date Requested Status
Timo Aaltonen (community) Approve on 2019-03-29
Andy Whitcroft 2018-08-28 Pending
Ubuntu Server Dev import team 2018-08-13 Pending
Review via email: mp+352960@code.launchpad.net
To post a comment you must log in.
Timo Aaltonen (tjaalton) wrote :

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

review: Approve
Timo Aaltonen (tjaalton) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/modprobe.d/blacklist.conf b/debian/modprobe.d/blacklist.conf
2index 08b3854..eecdf12 100644
3--- a/debian/modprobe.d/blacklist.conf
4+++ b/debian/modprobe.d/blacklist.conf
5@@ -25,9 +25,6 @@ blacklist snd_intel8x0m
6 # Conflicts with dvb driver (which is better for handling this device)
7 blacklist snd_aw2
8
9-# causes failure to suspend on HP compaq nc6000 (Ubuntu: #10306)
10-blacklist i2c_i801
11-
12 # replaced by p54pci
13 blacklist prism54
14

Subscribers

People subscribed via source and target branches