diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 70a8c54f0..fa33ba88a 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -549,12 +549,25 @@ add_file "scst_local/README" "Documentation/scst/README.scst_local" \
 {
   ( cd ibmvstgt && ./generate-in-tree-patches "${kernel_version}" )
   if [ -e "ibmvstgt/in-tree-patches/${kernel_version}" ]; then
-    add_patch "ibmvstgt/in-tree-patches/${kernel_version}/libsrp.h.patch" \
-        "include/scsi/libsrp.h"
-    add_patch "ibmvstgt/in-tree-patches/${kernel_version}/libsrp.c.patch" \
-        "drivers/scsi/libsrp.c"
-    add_patch "ibmvstgt/in-tree-patches/${kernel_version}/ibmvstgt.c.patch" \
-        "drivers/scsi/ibmvscsi/ibmvstgt.c"
+    for f in \
+      drivers/scsi/Kconfig \
+      drivers/scsi/ibmvscsi/ibmvstgt.c \
+      drivers/scsi/libsrp.c \
+      drivers/scsi/scsi_sysfs.c \
+      drivers/scsi/scsi_tgt_if.c \
+      drivers/scsi/scsi_tgt_lib.c \
+      drivers/scsi/scsi_tgt_priv.h \
+      drivers/scsi/scsi_transport_fc.c \
+      drivers/scsi/scsi_transport_fc_internal.h \
+      drivers/scsi/scsi_transport_srp.c \
+      drivers/scsi/scsi_transport_srp_internal.h \
+      include/scsi/libsrp.h \
+      include/scsi/scsi_host.h \
+      include/scsi/scsi_tgt.h \
+      include/scsi/scsi_tgt_if.h
+    do
+      add_patch "ibmvstgt/in-tree-patches/${kernel_version}/$(basename $f).patch" $f
+    done
   fi
 } \
 | process_patch "ibmvstgt.diff"
diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests
index 19b16f271..42e305f37 100755
--- a/scripts/run-regression-tests
+++ b/scripts/run-regression-tests
@@ -382,17 +382,20 @@ function compile_kernel {
 # For more information about endianness annotations, see also
 # http://lwn.net/Articles/205624/.
 function run_sparse {
+  local k="$1"
   local kver="$(kernel_version $1)"
   local plevel="$(patchlevel $1)"
   local outputfile="${outputdir}/sparse-$1-output.txt"
   local subdir="$2"
+  shift
+  shift
 
-  echo "Running sparse on the patched kernel ..."
-  (
-    cd "${outputdir}/linux-$1" \
+  echo "Running sparse on the patched kernel in ${subdir} $@ ..."
+  ( 
+    cd "${outputdir}/linux-$k" \
     && make -s prepare \
     && make -s scripts \
-    && LC_ALL=C make -k C=2 CF=-D__CHECK_ENDIAN__ M="${subdir}"
+    && LC_ALL=C make -k C=2 CF=-D__CHECK_ENDIAN__ M="${subdir}" "$@"
   ) &> "${outputfile}"
   local errors=$(grep -c ' error:' "${outputfile}")
   local warnings=$(grep -c ' warning:' "${outputfile}")
@@ -593,6 +596,13 @@ do
   patch_and_configure_kernel $k
   if [ "${run_sparse}" = "true" ]; then
     run_sparse $k drivers/scst
+    mv ${outputdir}/sparse-$k-output.txt ${outputdir}/sparse-$k-scst-output.txt
+    if [ "$k" = "2.6.35" ]; then
+      run_sparse $k drivers/scsi libsrp.ko scsi_sysfs.ko \
+                                 scsi_transport_fc.ko scsi_transport_srp.ko
+      mv ${outputdir}/sparse-$k-output.txt \
+         ${outputdir}/sparse-$k-scsi-output.txt
+    fi
   fi
   compile_kernel $k drivers/scst
   if [ "${full_check}" = "true" ]; then