mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-12-19 18:23:09 -08:00
parent ff861a35f8 5e2e7bca82
commit 3a39db9932
5 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qla2x00t-32gbit/Kconfig
View File

@@ -35,7 +35,7 @@ config SCSI_QLA2XXX_TARGET
bool "QLogic 2xxx target mode support"
depends on SCSI_QLA_FC
default y
---help---
help
This option enables target mode hooks used by the SCST qla2x00t
driver. Once qla2x00tgt module is loaded, target mode for each
port can be enable via sysfs interface.
@@ -46,5 +46,5 @@ config SCST_QLA_TGT_ADDON
tristate "QLogic SCST Target Driver"
depends on SCSI_QLA2XXX_TARGET
default y
---help---
help
SCST QLogic 32 gbit/s target driver.

4
qla2x00t/Kconfig
View File

@@ -3,7 +3,7 @@ config SCSI_QLA_FC
depends on PCI && SCSI
select SCSI_FC_ATTRS
select FW_LOADER
---help---
help
This qla2xxx driver supports all QLogic Fibre Channel
PCI and PCIe host adapters.
@@ -30,7 +30,7 @@ config SCSI_QLA2XXX_TARGET
bool "QLogic 2xxx target mode support"
depends on SCSI_QLA_FC
default y
---help---
help
This option enables target mode hooks used by the SCST qla2x00t
driver. Once qla2x00tgt module is loaded, target mode for each
port can be enable via sysfs interface.

58
scripts/kernel-functions
View File

@@ -137,7 +137,7 @@ function patch_kernel {
# support for gcc 5") # v3.18. See also commit cb984d101b30
# ("compiler-gcc: integrate the various compiler-gcc[345].h
# files") # v4.2.
if kernel_version_le 2.6.29 $1 && kernel_version_lt $1 4.2; then
if kernel_version_le 2.6.29 "$1" && kernel_version_lt "$1" 4.2; then
# Tell the kernel that we are using gcc 4.6 since older kernel
# versions do not support recent gcc versions.
patch -f -s -p1 <<'EOF' ||
@@ -421,7 +421,7 @@ index d6d65537b0d9..6aad8308a0ac 100644
EOF
fi
if kernel_version_le 2.6.36 $1 && kernel_version_lt $1 4.8; then
if kernel_version_le 2.6.36 "$1" && kernel_version_lt "$1" 4.8; then
patch -f -s -p1 <<'EOF'
From c6a385539175ebc603da53aafb7753d39089f32e Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
@@ -646,7 +646,7 @@ EOF
;;
esac
if kernel_version_le 3.2 $1 && kernel_version_lt $1 3.18; then
if kernel_version_le 3.2 "$1" && kernel_version_lt "$1" 3.18; then
patch -f -s -p1 <<'EOF'
From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
@@ -688,7 +688,7 @@ EOF
# See also commit e33a814e772c ("scripts/dtc: Remove redundant YYLOC global
# declaration") # v5.6~10^2.
if kernel_version_lt $1 5.6; then
if kernel_version_lt "$1" 5.6; then
patch -p1 -f -s <<'EOF'
From e33a814e772cdc36436c8c188d8c42d019fda639 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
@@ -804,28 +804,36 @@ function download_and_extract_distro_rpm {
}
function download_and_extract_kernel_tree {
if [ -e "${kernel_tree}" ]; then
{ [ "${1/^}" = "$1" ] &&
(
cd "${kernel_tree}" &&
{
{ git tag -l "v$1" | grep -q '^v'; } ||
{
echo "Could not find tag v$1;" \
"updating git repository" 1>&2
git fetch origin
git fetch stable
}
} &&
{ git tag -l "v$1" | grep -q '^v'; } &&
git archive "v$1"
) | {
rm -rf "linux-$1" &&
mkdir "linux-$1" &&
tar -C "linux-$1" -xf- 2>/dev/null
}; } || download_and_extract_distro_rpm "$1"
if [ "${1/^}" = "$1" ]; then
# Upstream kernel.
if [ -e "${kernel_tree}" ]; then
# If a git kernel tree is available, obtain the kernel source code
# from that git tree.
(
cd "${kernel_tree}" &&
{
{ git tag -l "v$1" | grep -q '^v'; } ||
{
echo "Could not find tag v$1;" \
"updating git repository" 1>&2
git fetch origin
git fetch stable
}
} &&
{ git tag -l "v$1" | grep -q '^v'; } &&
git archive "v$1"
) | {
rm -rf "linux-$1" &&
mkdir "linux-$1" &&
tar -C "linux-$1" -xf- 2>/dev/null
}
else
# Otherwise download a source code tar file and extract it.
download_kernel "$1" && extract_kernel_tree "$1"
fi
else
download_kernel "$1" && extract_kernel_tree "$1"
# Distro kernel.
download_and_extract_distro_rpm "$1"
fi &&
(cd "linux-${1/^*}" && patch_kernel "${1/^*}")
}

14
scripts/run-regression-tests
View File

@@ -379,7 +379,7 @@ function compile_kernel {
echo "Compiling the patched kernel ..."
if (cd "${outputdir}/linux-$k" \
&& make -s prepare \
&& make -s modules_prepare \
&& make -s scripts \
&& for subdir; do LC_ALL=C make -k M="${subdir}"; done
) &> "${outputfile}"
@@ -409,7 +409,7 @@ function run_sparse {
echo "Running sparse on the patched kernel in $* ..."
if (cd "${outputdir}/linux-$k" \
&& make -s prepare \
&& make -s modules_prepare \
&& make -s scripts \
&& if grep -q '^CONFIG_PPC=y$' .config; then LC_ALL=C make -k M=arch/powerpc/lib; fi \
&& for subdir; do
@@ -450,7 +450,7 @@ function run_smatch {
if (cd "${outputdir}/linux-$k" &&
for c in $disable; do sed -i.tmp "s/^$c=y\$/$c=n/" .config; done &&
make -s oldconfig </dev/null &&
make -s prepare &&
make -s modules_prepare &&
make -s scripts &&
if grep -q '^CONFIG_PPC=y$' .config; then LC_ALL=C make -k M=arch/powerpc/lib; fi &&
for subdir; do
@@ -482,7 +482,7 @@ function run_checkstack {
echo "Running checkstack on the patched $1 kernel ..."
(
cd "${outputdir}/linux-$1" \
&& make -s prepare \
&& make -s modules_prepare \
&& make -s scripts \
&& LC_ALL=C make -k checkstack
) &> "${outputfile}"
@@ -499,7 +499,7 @@ function run_namespacecheck {
echo "Running namespacecheck on the patched $1 kernel ..."
(
cd "${outputdir}/linux-$1" \
&& make -s prepare \
&& make -s modules_prepare \
&& make -s scripts \
&& LC_ALL=C make -k namespacecheck
) &> "${outputfile}"
@@ -516,7 +516,7 @@ function run_headers_check {
echo "Running headers check on the patched $1 kernel ..."
(
cd "${outputdir}/linux-$1" \
&& make -s prepare \
&& make -s modules_prepare \
&& make -s scripts \
&& LC_ALL=C make -k headers_check
) &> "${outputfile}"
@@ -536,7 +536,7 @@ function run_make_htmldocs {
echo "Generating HTML documentation for the patched $1 kernel ..."
(
cd "${outputdir}/linux-$1" \
&& make -s prepare \
&& make -s modules_prepare \
&& make -s scripts \
&& LC_ALL=C make -k htmldocs
) &> "${outputfile}"

17
srpt/src/Kconfig
View File

@@ -1,12 +1,11 @@
config SCST_SRPT
tristate "InfiniBand SCSI RDMA Protocol target support"
depends on INFINIBAND && SCST
---help---
Support for the SCSI RDMA Protocol (SRP) Target driver. The
SRP protocol is a protocol that allows an initiator to access
a block storage device on another host (target) over a network
that supports the RDMA protocol. Currently the RDMA protocol is
supported by InfiniBand and by iWarp network hardware. More
information about the SRP protocol can be found on the website
of the INCITS T10 technical committee (http://www.t10.org/).
help
Support for the SCSI RDMA Protocol (SRP) Target driver. The
SRP protocol is a protocol that allows an initiator to access
a block storage device on another host (target) over a network
that supports the RDMA protocol. Currently the RDMA protocol is
supported by InfiniBand and by iWarp network hardware. More
information about the SRP protocol can be found on the website
of the INCITS T10 technical committee (http://www.t10.org/).