diff --git a/.gitignore b/.gitignore
index a2a7dbba6..fc39ba618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,6 @@ debian/scstadmin/
 debian/tmp/
 dpkg/
 fcst/build_mode
-ibmvstgt/in-tree-patches
 iscsi-scst/conftest/*/result-*.txt
 iscsi-scst/include/iscsi_scst_itf_ver.h
 iscsi-scst/usr/iscsi-scst-adm
diff --git a/debian/copyright b/debian/copyright
index 6a8e1152c..86fa5b56e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,24 +13,6 @@ Files: Makefile
        fcst/ft_cmd.c
        fcst/ft_scst.c
        fcst/ft_sess.c
-       ibmvstgt/src/orig/2.6.35/scsi_transport_srp.c
-       ibmvstgt/src/orig/2.6.36/scsi_transport_srp.c
-       ibmvstgt/src/scsi_transport_srp.c
-       mpt/Makefile
-       mvsas_tgt/Makefile
-       mvsas_tgt/mv_64xx.c
-       mvsas_tgt/mv_64xx.h
-       mvsas_tgt/mv_94xx.c
-       mvsas_tgt/mv_94xx.h
-       mvsas_tgt/mv_chips.h
-       mvsas_tgt/mv_defs.h
-       mvsas_tgt/mv_init.c
-       mvsas_tgt/mv_sas.c
-       mvsas_tgt/mv_sas.h
-       mvsas_tgt/mv_spi.c
-       mvsas_tgt/mv_spi.h
-       mvsas_tgt/mv_tgt.c
-       mvsas_tgt/mv_tgt.h
        qla2x00t/qla2x00-target/Makefile
        qla2x00t/qla2x00-target/qla2x00t.c
        qla2x00t/qla2x00-target/qla2x00t.h
@@ -64,26 +46,7 @@ Copyright: 2008-2017, Bart Van Assche <bvanassche@acm.org>
            2004-2017, Vladislav Bolkhovitin <vst@vlnb.net>
 License: GPL-2
 
-Files: ibmvstgt/src/SLES-10-SP3-ibmvscsis.c
-       ibmvstgt/src/ibmvscsi.h
-       ibmvstgt/src/ibmvstgt.c
-       ibmvstgt/src/libsrp.c
-       ibmvstgt/src/orig/2.6.35/ibmvstgt.c
-       ibmvstgt/src/orig/2.6.35/libsrp.c
-       ibmvstgt/src/orig/2.6.35/scsi_tgt_if.c
-       ibmvstgt/src/orig/2.6.35/scsi_tgt_if.h
-       ibmvstgt/src/orig/2.6.35/scsi_tgt_lib.c
-       ibmvstgt/src/orig/2.6.35/scsi_transport_fc.c
-       ibmvstgt/src/orig/2.6.36/ibmvstgt.c
-       ibmvstgt/src/orig/2.6.36/libsrp.c
-       ibmvstgt/src/orig/2.6.36/scsi_tgt_if.c
-       ibmvstgt/src/orig/2.6.36/scsi_tgt_if.h
-       ibmvstgt/src/orig/2.6.36/scsi_tgt_lib.c
-       ibmvstgt/src/orig/2.6.36/scsi_transport_fc.c
-       ibmvstgt/src/scsi_transport_fc.c
-       ibmvstgt/src/viosrp.h
-       mpt/mpt_scst.c
-       qla2x00t/qla2x_tgt.h
+Files: qla2x00t/qla2x_tgt.h
        qla2x00t/qla2x_tgt_def.h
 Copyright: 2010, Bart Van Assche <bvanassche@acm.org>
            2005, Beijing Soul Technology Co., Ltd
diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 8040f73fc..5d8a61a03 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -643,7 +643,7 @@ fi
 # Directory drivers/scsi/ibmvstgt
 
 {
-  ( cd ibmvstgt && ./generate-in-tree-patches "${kver}" )
+  ( cd ibmvstgt 2>/dev/null && ./generate-in-tree-patches "${kver}" ) &&
   if [ -e "ibmvstgt/in-tree-patches/${kver}" ]; then
     if [ "${multiple_patches}" = "true" ]; then
       cat <<EOF
@@ -747,7 +747,7 @@ EOF
 | process_patch "scst_18_ibmvstgt.diff"
 
 {
-  ( cd ibmvstgt && ./generate-in-tree-patches "${kver}" )
+  ( cd ibmvstgt 2>/dev/null && ./generate-in-tree-patches "${kver}" ) &&
   if [ -e "ibmvstgt/in-tree-patches/${kver}" ]; then
     if [ "${multiple_patches}" = "true" ]; then
       cat <<EOF
diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests
index 4cb024949..fa669dc4c 100755
--- a/scripts/run-regression-tests
+++ b/scripts/run-regression-tests
@@ -695,11 +695,6 @@ do
                                  scsi_transport_fc.ko scsi_transport_srp.ko
       mv "${outputdir}/sparse-$k-output.txt" \
          "${outputdir}/sparse-$k-scsi-output.txt"
-      if [ "$(uname -m)" = "ppc32" ] || [ "$(uname -m)" = "ppc64" ]; then
-        run_sparse "$k" drivers/scsi/ibmvscsi ibmvstgt.ko
-        mv "${outputdir}/sparse-$k-output.txt" \
-           "${outputdir}/sparse-$k-ibmvstgt-output.txt"
-      fi
     fi
   fi
   if [ "${run_smatch}" = "true" ]; then