From b2f00687fd15aba4c210906fac5b621c050d3afd Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 2 May 2017 18:32:56 +0000 Subject: [PATCH 1/2] scripts/generate-kernel-patch: Stop applying the put_page_callback and exec_req_fifo patches git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7164 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 37 ----------------------------------- 1 file changed, 37 deletions(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 7230b2ed3..672ea1a2a 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -272,43 +272,6 @@ done # General kernel patches. -scsi_exec_req_fifo_defined=0 -scst_io_context=0 -for p in scst/kernel/*-${kver}.patch \ - $(if [ "${1#3.2.}" != "$1" ] && [ "${1#3.2.}" -ge 57 ]; then - echo iscsi-scst/kernel/patches/*-3.2.57.patch; - elif [ "${1#3.7.}" != "$1" ] && [ "${1#3.7.}" -ge 10 ]; then - echo iscsi-scst/kernel/patches/*-3.7.10.patch; - elif [ "${1#3.10.}" != "$1" ] && [ "${1#3.10.}" -ge 30 ]; then - echo iscsi-scst/kernel/patches/*-3.10.30.patch; - elif [ "${1#3.12.}" != "$1" ] && [ "${1#3.12.}" -ge 11 ]; then - echo iscsi-scst/kernel/patches/*-3.12.11.patch; - elif [ "${1#3.13.}" != "$1" ] && [ "${1#3.13.}" -ge 3 ]; then - echo iscsi-scst/kernel/patches/*-3.13.3.patch; - else - echo iscsi-scst/kernel/patches/*-"${kver}".patch; - fi) -do - [ -e "$p" ] || continue - # Exclude the put_page_callback patch when command-line option -u has been - # specified since the current approach is not considered acceptable for - # upstream kernel inclusion. See also http://lkml.org/lkml/2008/12/11/213. - if [ "${generating_upstream_patch}" = "false" ] || - [ "${p#iscsi-scst/kernel/patches/put_page_callback}" = "$p" ] - then - if grep -q '^\+#define SCSI_EXEC_REQ_FIFO_DEFINED$' "${p}"; then - scsi_exec_req_fifo_defined=1 - fi - if grep -q '^\+#define SCST_IO_CONTEXT$' "${p}"; then - scst_io_context=1 - fi - diffname="${p#scst/kernel/}" - diffname="${p%-${kver}.patch}.diff" - process_patch < "$p" "${diffname}" - fi -done - - scst_03_public_headers="scst/include/scst.h scst/include/scst_const.h \ scst/include/scst_event.h scst/include/backport.h" scst_04_main="scst/src/scst_main.c scst/src/scst_module.c scst/src/scst_priv.h \ From 642744c9fc48d90a818f5bb32e511b17d004ccc5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 2 May 2017 22:32:06 +0000 Subject: [PATCH 2/2] Fix spelling of "Ardis Technologies" Reference: http://www.ddpsan.com/support-sales/about-us. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7165 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/conn.c | 2 +- iscsi-scst/kernel/iscsi.c | 2 +- iscsi-scst/kernel/iscsi.h | 2 +- iscsi-scst/kernel/iscsi_hdr.h | 2 +- iscsi-scst/kernel/session.c | 2 +- iscsi-scst/kernel/target.c | 2 +- iscsi-scst/usr/chap.c | 2 +- iscsi-scst/usr/conn.c | 2 +- iscsi-scst/usr/iscsi_hdr.h | 2 +- iscsi-scst/usr/iscsi_scstd.c | 2 +- iscsi-scst/usr/iscsid.c | 2 +- iscsi-scst/usr/iscsid.h | 2 +- iscsi-scst/usr/log.c | 2 +- iscsi-scst/usr/session.c | 2 +- iscsi-scst/usr/target.c | 2 +- iscsi-scst/usr/types.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/iscsi-scst/kernel/conn.c b/iscsi-scst/kernel/conn.c index 2f5bf97fe..3b3fcc511 100644 --- a/iscsi-scst/kernel/conn.c +++ b/iscsi-scst/kernel/conn.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index 0e0d66168..8b25dc070 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/kernel/iscsi.h b/iscsi-scst/kernel/iscsi.h index d5fb6ebe9..deaac7fb7 100644 --- a/iscsi-scst/kernel/iscsi.h +++ b/iscsi-scst/kernel/iscsi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/kernel/iscsi_hdr.h b/iscsi-scst/kernel/iscsi_hdr.h index a14384ef4..27242334c 100644 --- a/iscsi-scst/kernel/iscsi_hdr.h +++ b/iscsi-scst/kernel/iscsi_hdr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/kernel/session.c b/iscsi-scst/kernel/session.c index 6111b73d1..dd80debbe 100644 --- a/iscsi-scst/kernel/session.c +++ b/iscsi-scst/kernel/session.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/kernel/target.c b/iscsi-scst/kernel/target.c index 5f1b02e0b..3abe23f21 100644 --- a/iscsi-scst/kernel/target.c +++ b/iscsi-scst/kernel/target.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/chap.c b/iscsi-scst/usr/chap.c index 07ee506b2..df91256b9 100644 --- a/iscsi-scst/usr/chap.c +++ b/iscsi-scst/usr/chap.c @@ -2,7 +2,7 @@ * chap.c - support for (mutual) CHAP authentication. * * Copyright (C) 2004 Xiranet Communications GmbH - * Copyright (C) 2002 - 2003 Ardis Technolgies , + * Copyright (C) 2002 - 2003 Ardis Technologies , * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/conn.c b/iscsi-scst/usr/conn.c index 2a202493f..ac1181120 100644 --- a/iscsi-scst/usr/conn.c +++ b/iscsi-scst/usr/conn.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/iscsi_hdr.h b/iscsi-scst/usr/iscsi_hdr.h index 558d52684..28f913efe 100644 --- a/iscsi-scst/usr/iscsi_hdr.h +++ b/iscsi-scst/usr/iscsi_hdr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/iscsi_scstd.c b/iscsi-scst/usr/iscsi_scstd.c index 3532d37a1..d6b42bf41 100644 --- a/iscsi-scst/usr/iscsi_scstd.c +++ b/iscsi-scst/usr/iscsi_scstd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/iscsid.c b/iscsi-scst/usr/iscsid.c index 56b20d6cb..7dcd64725 100644 --- a/iscsi-scst/usr/iscsid.c +++ b/iscsi-scst/usr/iscsid.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/iscsid.h b/iscsi-scst/usr/iscsid.h index c24902b71..ef4bef36d 100644 --- a/iscsi-scst/usr/iscsid.h +++ b/iscsi-scst/usr/iscsid.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/log.c b/iscsi-scst/usr/log.c index 56576af62..f740a2b40 100644 --- a/iscsi-scst/usr/log.c +++ b/iscsi-scst/usr/log.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/session.c b/iscsi-scst/usr/session.c index 8490a4961..64e7cc700 100644 --- a/iscsi-scst/usr/session.c +++ b/iscsi-scst/usr/session.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/target.c b/iscsi-scst/usr/target.c index f9c8d5e01..b17a800d0 100644 --- a/iscsi-scst/usr/target.c +++ b/iscsi-scst/usr/target.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation * diff --git a/iscsi-scst/usr/types.h b/iscsi-scst/usr/types.h index a45027437..32a1f65ed 100644 --- a/iscsi-scst/usr/types.h +++ b/iscsi-scst/usr/types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 - 2003 Ardis Technolgies + * Copyright (C) 2002 - 2003 Ardis Technologies * Copyright (C) 2007 - 2017 Vladislav Bolkhovitin * Copyright (C) 2007 - 2017 SanDisk Corporation *