Merge lp:~smoser/ubuntu/raring/kmod/lp-1115710 into lp:ubuntu/raring/kmod

Proposed by Scott Moser on 2013-02-06
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp:~smoser/ubuntu/raring/kmod/lp-1115710
Merge into: lp:ubuntu/raring/kmod
Diff against target: 21 lines (+9/-0)
2 files modified
debian/changelog (+7/-0)
debian/modprobe.d/mlx4.conf (+2/-0)
To merge this branch: bzr merge lp:~smoser/ubuntu/raring/kmod/lp-1115710
Reviewer Review Type Date Requested Status
Ubuntu Development Team 2013-02-06 Pending
Review via email: mp+146760@code.launchpad.net
To post a comment you must log in.
12. By Scott Moser on 2013-02-07

use 'install' rather than soft-dep.

See bug for why, but soft-dep had issues when creating initramfs.

13. By Scott Moser on 2013-02-07

use soft dep again, and only load mlx4_en.

This avoids pulling _ib stack in.
And also raring doesn't have the issue, and soft dep seems cleaner.

14. By Scott Moser on 2013-02-07

update comment string to remove mlx4_ib

15. By Scott Moser on 2013-02-07

better comment

16. By Scott Moser on 2013-02-07

fix changelog message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-01-24 00:11:39 +0000
3+++ debian/changelog 2013-02-07 18:15:26 +0000
4@@ -1,3 +1,10 @@
5+kmod (9-2ubuntu7) UNRELEASED; urgency=low
6+
7+ * Add /etc/modprobe.d/mlx4.conf for loading mlx4_en when mlx4_core gets
8+ loaded (LP: #1115710).
9+
10+ -- Scott Moser <smoser@ubuntu.com> Tue, 05 Feb 2013 15:36:49 -0500
11+
12 kmod (9-2ubuntu6) raring; urgency=low
13
14 * Remove /etc/init/module-init-tools.conf on upgrade (LP: #1082006)
15
16=== added file 'debian/modprobe.d/mlx4.conf'
17--- debian/modprobe.d/mlx4.conf 1970-01-01 00:00:00 +0000
18+++ debian/modprobe.d/mlx4.conf 2013-02-07 18:15:26 +0000
19@@ -0,0 +1,2 @@
20+# mlx4_core gets automatically loaded, load mlx4_en also (LP: #1115710)
21+softdep mlx4_core post: mlx4_en

Subscribers

People subscribed via source and target branches

to all changes: