diff --git a/iscsi-scst/kernel/isert-scst/Kconfig b/iscsi-scst/kernel/isert-scst/Kconfig index 170ab0b0a..1cbc3e477 100644 --- a/iscsi-scst/kernel/isert-scst/Kconfig +++ b/iscsi-scst/kernel/isert-scst/Kconfig @@ -1,6 +1,6 @@ config SCST_ISER tristate "iSER Target Driver" - depends on SCST && SCST_ISCSI + depends on SCST && SCST_ISCSI && INFINIBAND default SCST help ISER target driver for SCST framework. The iSCSI iSER extension diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index dc44b6f8a..de777d24f 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -19,7 +19,7 @@ ABT_KERNELS=" \ 3.7.10-nc \ 3.6.11-nc \ 3.5.7-nc \ -3.4.107-nc \ +3.4.108-nc \ 3.3.8-nc \ 3.2.67-nc \ 3.1.10-nc \ diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests index 96b7d74fc..745e3d19d 100755 --- a/scripts/run-regression-tests +++ b/scripts/run-regression-tests @@ -391,7 +391,7 @@ function run_smatch { echo "${errors} errors / ${warnings} warnings." cat "${outputfile}" | grep -E ' info:| warning:| error:' | - sed 's/^\([^:]*\):[0-9:]* /\1: /' | + sed 's/^\([^:]*\):[0-9:]* /\1: /;s/\((see line \)[0-9]*\()\)/\1...\2/' | sort | uniq -c else