[linux] 01/01: [x86] udeb: Move scsi_transport_fc to scsi-core-modules

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit e52fccf3e5f647c04765a86071b3839cbb550441
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Feb 18 01:26:34 2016 +0000

    [x86] udeb: Move scsi_transport_fc to scsi-core-modules
    
    hv_storvsc in hyperv-modules now depends on it so we need to avoid duplicating
    it in {hyperv,scsi}-modules.
---
 debian/changelog                                       | 2 ++
 debian/installer/amd64/modules/amd64/scsi-core-modules | 3 +++
 debian/installer/i386/modules/i386/scsi-core-modules   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 385ea43..31fda95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ linux (4.5~rc4-1~exp1) UNRELEASED; urgency=medium
   * aufs: Update support patches to aufs4.x-rcN-20160215
   * Compile with gcc-5 on all architectures
   * [hppa] Update build-dependencies for renaming of binutils-hppa64
+  * [x86] udeb: Move scsi_transport_fc to scsi-core-modules, since hv_storvsc
+    now depends on it
 
  -- Roger Shimizu <rogershimizu at gmail.com>  Sun, 14 Feb 2016 00:32:40 +0900
 
diff --git a/debian/installer/amd64/modules/amd64/scsi-core-modules b/debian/installer/amd64/modules/amd64/scsi-core-modules
index dd65d66..778a022 100644
--- a/debian/installer/amd64/modules/amd64/scsi-core-modules
+++ b/debian/installer/amd64/modules/amd64/scsi-core-modules
@@ -1 +1,4 @@
 #include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/debian/installer/i386/modules/i386/scsi-core-modules b/debian/installer/i386/modules/i386/scsi-core-modules
index dd65d66..778a022 100644
--- a/debian/installer/i386/modules/i386/scsi-core-modules
+++ b/debian/installer/i386/modules/i386/scsi-core-modules
@@ -1 +1,4 @@
 #include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git