Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2018-11-04 13:22:10 -08:00
2 changed files with 9 additions and 6 deletions

View File

@@ -3,21 +3,22 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
4.18.14 \
4.19.1 \
4.18.16-nc \
4.17.18-nc \
4.16.18-nc \
4.15.18-nc \
4.14.76-nc \
4.14.78-nc \
4.13.16-nc \
4.12.14-nc \
4.11.12-nc \
4.10.17-nc \
4.9.133-nc \
4.9.135-nc \
4.8.17-nc \
4.7.10-nc \
4.6.7-nc \
4.5.7-nc \
4.4.161-nc \
4.4.162-nc \
4.3.6-nc \
4.2.8-nc \
4.1.52-nc \
@@ -25,7 +26,7 @@ ABT_KERNELS=" \
3.19.8-nc \
3.18.124-nc \
3.17.8-nc \
3.16.57-nc \
3.16.60-nc \
3.15.10-nc \
3.14.79-nc \
3.13.11-nc \

View File

@@ -395,7 +395,9 @@ EOF
done
{
add_file "scst/README_in-tree" "Documentation/scst/README.scst"
if [ -e scst/README_in-tree ]; then
add_file "scst/README_in-tree" "Documentation/scst/README.scst"
fi
add_file "scst/SysfsRules" "Documentation/scst/SysfsRules"
} | process_patch "scst_11_core_doc.diff"