[linux] 01/01: [powerpc/powerpc64, ppc64*] target: Enable SCSI_IBMVSCSIS as module

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch sid
in repository linux.

commit ca91ae2eb7da09bd88f0d3322e1cebe3307b972b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Apr 8 01:36:11 2017 +0100

    [powerpc/powerpc64,ppc64*] target: Enable SCSI_IBMVSCSIS as module
    
    This driver was removed in 3.18, but has been updated to use the new
    target framework and was added again in 4.8.
    
    As it lives under drivers/scsi and not drivers/target, exclude it from
    the scsi-modules udeb.
---
 debian/changelog                                                | 1 +
 debian/config/kernelarch-powerpc/config-arch-64                 | 1 +
 debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d0e56e..b49679b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium
   * [x86] usbip: Increase USBIP_VHCI_NR_HCS to 8 and USBIP_VHCI_HC_PORTS to 31
     (Closes: #859641)
   * drm/nouveau/disp/mcp7x: disable dptmds workaround (Closes: #850219)
+  * [powerpc/powerpc64,ppc64*] target: Enable SCSI_IBMVSCSIS as module
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Mar 2017 18:27:30 +0100
 
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index ac68835..1adb2a6 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -130,6 +130,7 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IBMVSCSIS=m
 CONFIG_SCSI_IBMVFC=m
 CONFIG_SCSI_QLOGIC_1280=m
 
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules
index 62f9ed2..d0671e5 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules
+++ b/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules
@@ -3,3 +3,6 @@
 ibmvscsi
 ps3disk ?
 ps3rom
+
+# Exclude target driver
+ibmvscsis -

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