From 84c07327c4e63873dd06fc053f7931dde8878309 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 23 Nov 2016 04:31:25 +0000 Subject: [PATCH] Merged revisions 7012-7029 via svnmerge from svn+ssh://svn.code.sf.net/p/scst/svn/trunk ........ r7012 | vlnb | 2016-10-17 22:00:58 -0700 (Mon, 17 Oct 2016) | 3 lines iscsi-scst: HOWTO updated ........ r7013 | bvassche | 2016-10-21 14:21:29 -0700 (Fri, 21 Oct 2016) | 2 lines scst regression tests: Unload the scst kernel module explicitly ........ r7014 | bvassche | 2016-10-21 14:54:02 -0700 (Fri, 21 Oct 2016) | 1 line scstadmin: Avoid that specifying an attribute multiple times results in an incomprehensible error message ........ r7015 | vlnb | 2016-10-21 19:19:03 -0700 (Fri, 21 Oct 2016) | 3 lines Docs updates ........ r7016 | bvassche | 2016-10-25 13:49:21 -0700 (Tue, 25 Oct 2016) | 1 line scst_user: Port to Linux kernel v4.9 ........ r7017 | bvassche | 2016-10-25 13:50:15 -0700 (Tue, 25 Oct 2016) | 4 lines ib_srpt: Cache global L_Key This patch does not change any functionality. ........ r7018 | bvassche | 2016-10-25 13:50:34 -0700 (Tue, 25 Oct 2016) | 2 lines ib_srpt: Port to Linux kernel v4.9 ........ r7019 | bvassche | 2016-10-25 15:21:46 -0700 (Tue, 25 Oct 2016) | 4 lines isert-scst: Cache L_Key This patch does not change any functionality. ........ r7020 | bvassche | 2016-10-25 15:22:07 -0700 (Tue, 25 Oct 2016) | 2 lines isert-scst: Port to Linux kernel v4.9 ........ r7021 | bvassche | 2016-10-26 14:33:50 -0700 (Wed, 26 Oct 2016) | 1 line iscsi-scst: Port to Linux kernel versions >= v4.7 ........ r7022 | vlnb | 2016-11-16 20:33:38 -0800 (Wed, 16 Nov 2016) | 7 lines generate-kernel-patch: fix custom cross-compilation kernel case Otherwise there is non-fatal error like: No such file or directory grep: /lib/modules//build/.config: Permission denied ........ r7023 | vlnb | 2016-11-16 20:44:48 -0800 (Wed, 16 Nov 2016) | 3 lines generate-kernel-patch: optimize generation of Makefile for qla2x00t ........ r7024 | vlnb | 2016-11-16 20:55:15 -0800 (Wed, 16 Nov 2016) | 3 lines generate-kernel-patch: optimize generation of Makefile for dev_handlers ........ r7025 | vlnb | 2016-11-16 21:06:59 -0800 (Wed, 16 Nov 2016) | 3 lines generate-kernel-patch: optimize generation of Makefile for scst ........ r7026 | vlnb | 2016-11-16 21:12:33 -0800 (Wed, 16 Nov 2016) | 3 lines generate-kernel-patch: optimize generation of Makefile for drivers/Kconfig ........ r7027 | vlnb | 2016-11-16 21:18:55 -0800 (Wed, 16 Nov 2016) | 3 lines generate-kernel-patch: optimize generation of Makefile.drivers patch ........ r7028 | vlnb | 2016-11-16 21:24:07 -0800 (Wed, 16 Nov 2016) | 3 lines generate-kernel-patch: optimize generation of Makefile for scst_local ........ r7029 | vlnb | 2016-11-22 19:45:35 -0800 (Tue, 22 Nov 2016) | 5 lines scst: fix overflows handling for tapes Reported and tested by Matthew D. Frederes ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.2.x@7030 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/doc/iscsi-scst-howto.txt | 110 +++++++++++++----- iscsi-scst/kernel/isert-scst/iser.h | 3 + iscsi-scst/kernel/isert-scst/iser_pdu.c | 2 +- iscsi-scst/kernel/isert-scst/iser_rdma.c | 15 ++- iscsi-scst/kernel/nthread.c | 5 +- ...kefile_in-tree-2.6.35 => Makefile_in-tree} | 0 .../qla2x00-target/Makefile_in-tree-2.6.36 | 5 - .../qla2x00-target/Makefile_in-tree-2.6.37 | 5 - .../qla2x00-target/Makefile_in-tree-2.6.38 | 5 - .../qla2x00-target/Makefile_in-tree-2.6.39 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.0 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.1 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.10 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.11 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.12 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.13 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.14 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.15 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.16 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.17 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.18 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.19 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.2 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.3 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.4 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.5 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.6 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.7 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.8 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-3.9 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-4.0 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-4.1 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-4.2 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-4.3 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-4.4 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-4.5 | 5 - qla2x00t/qla2x00-target/Makefile_in-tree-4.6 | 5 - scripts/generate-kernel-patch | 62 +++++++--- scst/include/backport.h | 14 +++ .../Kconfig.drivers.Linux-2.6.37.patch | 13 --- .../Kconfig.drivers.Linux-2.6.38.patch | 13 --- .../Kconfig.drivers.Linux-2.6.39.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.0.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.1.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.10.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.11.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.13.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.14.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.15.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.16.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.17.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.18.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.19.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.2.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.3.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.4.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.5.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.6.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.7.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.8.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-3.9.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-4.0.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-4.1.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-4.2.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-4.3.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-4.4.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-4.5.patch | 13 --- .../in-tree/Kconfig.drivers.Linux-4.6.patch | 13 --- ...3.12.patch => Kconfig.drivers.Linux.patch} | 0 ..._handlers-2.6.35 => Makefile.dev_handlers} | 0 .../in-tree/Makefile.dev_handlers-2.6.36 | 14 --- .../in-tree/Makefile.dev_handlers-2.6.37 | 14 --- .../in-tree/Makefile.dev_handlers-2.6.38 | 14 --- .../in-tree/Makefile.dev_handlers-2.6.39 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.0 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.1 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.10 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.11 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.12 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.13 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.14 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.15 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.16 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.17 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.18 | 14 --- .../kernel/in-tree/Makefile.dev_handlers-3.19 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.2 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.3 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.4 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.5 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.6 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.7 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.8 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-3.9 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-4.0 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-4.1 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-4.2 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-4.3 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-4.4 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-4.5 | 14 --- scst/kernel/in-tree/Makefile.dev_handlers-4.6 | 14 --- .../in-tree/Makefile.drivers.Linux-3.10.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.11.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.12.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.13.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.14.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.15.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.16.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.17.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.18.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.7.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.8.patch | 12 -- .../in-tree/Makefile.drivers.Linux-3.9.patch | 12 -- .../in-tree/Makefile.drivers.Linux-4.0.patch | 12 -- .../in-tree/Makefile.drivers.Linux-4.1.patch | 12 -- .../in-tree/Makefile.drivers.Linux-4.2.patch | 12 -- .../in-tree/Makefile.drivers.Linux-4.3.patch | 12 -- .../in-tree/Makefile.drivers.Linux-4.4.patch | 12 -- .../in-tree/Makefile.drivers.Linux-4.5.patch | 12 -- .../in-tree/Makefile.drivers.Linux-4.6.patch | 12 -- ....19.patch => Makefile.drivers.Linux.patch} | 0 .../{Makefile.scst-2.6.33 => Makefile.scst} | 0 scst/kernel/in-tree/Makefile.scst-2.6.34 | 17 --- scst/kernel/in-tree/Makefile.scst-2.6.35 | 17 --- scst/kernel/in-tree/Makefile.scst-2.6.36 | 17 --- scst/kernel/in-tree/Makefile.scst-2.6.37 | 17 --- scst/kernel/in-tree/Makefile.scst-2.6.38 | 17 --- scst/kernel/in-tree/Makefile.scst-2.6.39 | 17 --- scst/kernel/in-tree/Makefile.scst-3.0 | 17 --- scst/kernel/in-tree/Makefile.scst-3.1 | 17 --- scst/kernel/in-tree/Makefile.scst-3.10 | 17 --- scst/kernel/in-tree/Makefile.scst-3.11 | 17 --- scst/kernel/in-tree/Makefile.scst-3.12 | 17 --- scst/kernel/in-tree/Makefile.scst-3.13 | 17 --- scst/kernel/in-tree/Makefile.scst-3.14 | 17 --- scst/kernel/in-tree/Makefile.scst-3.15 | 17 --- scst/kernel/in-tree/Makefile.scst-3.16 | 17 --- scst/kernel/in-tree/Makefile.scst-3.17 | 17 --- scst/kernel/in-tree/Makefile.scst-3.18 | 17 --- scst/kernel/in-tree/Makefile.scst-3.19 | 17 --- scst/kernel/in-tree/Makefile.scst-3.2 | 17 --- scst/kernel/in-tree/Makefile.scst-3.3 | 17 --- scst/kernel/in-tree/Makefile.scst-3.4 | 17 --- scst/kernel/in-tree/Makefile.scst-3.5 | 17 --- scst/kernel/in-tree/Makefile.scst-3.6 | 17 --- scst/kernel/in-tree/Makefile.scst-3.7 | 17 --- scst/kernel/in-tree/Makefile.scst-3.8 | 17 --- scst/kernel/in-tree/Makefile.scst-3.9 | 17 --- scst/kernel/in-tree/Makefile.scst-4.0 | 17 --- scst/kernel/in-tree/Makefile.scst-4.1 | 17 --- scst/kernel/in-tree/Makefile.scst-4.2 | 17 --- scst/kernel/in-tree/Makefile.scst-4.3 | 17 --- scst/kernel/in-tree/Makefile.scst-4.4 | 17 --- scst/kernel/in-tree/Makefile.scst-4.5 | 17 --- scst/kernel/in-tree/Makefile.scst-4.6 | 17 --- scst/src/dev_handlers/scst_user.c | 5 + scst/src/scst_lib.c | 25 ++-- .../in-tree/{Makefile-2.6.35 => Makefile} | 0 scst_local/in-tree/Makefile-2.6.36 | 2 - scst_local/in-tree/Makefile-2.6.37 | 2 - scst_local/in-tree/Makefile-2.6.38 | 2 - scst_local/in-tree/Makefile-2.6.39 | 2 - scst_local/in-tree/Makefile-3.0 | 2 - scst_local/in-tree/Makefile-3.1 | 2 - scst_local/in-tree/Makefile-3.10 | 2 - scst_local/in-tree/Makefile-3.11 | 2 - scst_local/in-tree/Makefile-3.12 | 2 - scst_local/in-tree/Makefile-3.13 | 2 - scst_local/in-tree/Makefile-3.14 | 2 - scst_local/in-tree/Makefile-3.15 | 2 - scst_local/in-tree/Makefile-3.16 | 2 - scst_local/in-tree/Makefile-3.17 | 2 - scst_local/in-tree/Makefile-3.18 | 2 - scst_local/in-tree/Makefile-3.19 | 2 - scst_local/in-tree/Makefile-3.2 | 2 - scst_local/in-tree/Makefile-3.3 | 2 - scst_local/in-tree/Makefile-3.4 | 2 - scst_local/in-tree/Makefile-3.5 | 2 - scst_local/in-tree/Makefile-3.6 | 2 - scst_local/in-tree/Makefile-3.7 | 2 - scst_local/in-tree/Makefile-3.8 | 2 - scst_local/in-tree/Makefile-3.9 | 2 - scst_local/in-tree/Makefile-4.0 | 2 - scst_local/in-tree/Makefile-4.1 | 2 - scst_local/in-tree/Makefile-4.2 | 2 - scst_local/in-tree/Makefile-4.3 | 2 - scst_local/in-tree/Makefile-4.4 | 2 - scst_local/in-tree/Makefile-4.5 | 2 - scst_local/in-tree/Makefile-4.6 | 2 - .../scst-1.0.0/t/01-start-scst.t | 3 +- .../scst-1.0.0/t/99-stop-scst.t | 3 +- scstadmin/scstadmin.sysfs/scstadmin | 2 + srpt/src/ib_srpt.c | 17 ++- srpt/src/ib_srpt.h | 6 +- www/index.html | 1 + 195 files changed, 208 insertions(+), 1882 deletions(-) rename qla2x00t/qla2x00-target/{Makefile_in-tree-2.6.35 => Makefile_in-tree} (100%) delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.0 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.1 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.10 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.11 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.12 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.13 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.14 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.15 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.16 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.17 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.18 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.19 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.2 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.3 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.4 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.5 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.6 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.7 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.8 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-3.9 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.0 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.1 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.2 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.3 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.4 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.5 delete mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-4.6 delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch delete mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch rename scst/kernel/in-tree/{Kconfig.drivers.Linux-3.12.patch => Kconfig.drivers.Linux.patch} (100%) rename scst/kernel/in-tree/{Makefile.dev_handlers-2.6.35 => Makefile.dev_handlers} (100%) delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.0 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.1 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.10 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.11 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.12 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.13 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.14 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.15 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.16 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.17 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.18 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.19 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.2 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.3 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.4 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.5 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.6 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.7 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.8 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-3.9 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.0 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.1 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.2 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.3 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.4 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.5 delete mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-4.6 delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch delete mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch rename scst/kernel/in-tree/{Makefile.drivers.Linux-3.19.patch => Makefile.drivers.Linux.patch} (100%) rename scst/kernel/in-tree/{Makefile.scst-2.6.33 => Makefile.scst} (100%) delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.34 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.35 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.36 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.37 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.38 delete mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.39 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.0 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.1 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.10 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.11 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.12 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.13 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.14 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.15 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.16 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.17 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.18 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.19 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.2 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.3 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.4 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.5 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.6 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.7 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.8 delete mode 100644 scst/kernel/in-tree/Makefile.scst-3.9 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.0 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.1 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.2 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.3 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.4 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.5 delete mode 100644 scst/kernel/in-tree/Makefile.scst-4.6 rename scst_local/in-tree/{Makefile-2.6.35 => Makefile} (100%) delete mode 100644 scst_local/in-tree/Makefile-2.6.36 delete mode 100644 scst_local/in-tree/Makefile-2.6.37 delete mode 100644 scst_local/in-tree/Makefile-2.6.38 delete mode 100644 scst_local/in-tree/Makefile-2.6.39 delete mode 100644 scst_local/in-tree/Makefile-3.0 delete mode 100644 scst_local/in-tree/Makefile-3.1 delete mode 100644 scst_local/in-tree/Makefile-3.10 delete mode 100644 scst_local/in-tree/Makefile-3.11 delete mode 100644 scst_local/in-tree/Makefile-3.12 delete mode 100644 scst_local/in-tree/Makefile-3.13 delete mode 100644 scst_local/in-tree/Makefile-3.14 delete mode 100644 scst_local/in-tree/Makefile-3.15 delete mode 100644 scst_local/in-tree/Makefile-3.16 delete mode 100644 scst_local/in-tree/Makefile-3.17 delete mode 100644 scst_local/in-tree/Makefile-3.18 delete mode 100644 scst_local/in-tree/Makefile-3.19 delete mode 100644 scst_local/in-tree/Makefile-3.2 delete mode 100644 scst_local/in-tree/Makefile-3.3 delete mode 100644 scst_local/in-tree/Makefile-3.4 delete mode 100644 scst_local/in-tree/Makefile-3.5 delete mode 100644 scst_local/in-tree/Makefile-3.6 delete mode 100644 scst_local/in-tree/Makefile-3.7 delete mode 100644 scst_local/in-tree/Makefile-3.8 delete mode 100644 scst_local/in-tree/Makefile-3.9 delete mode 100644 scst_local/in-tree/Makefile-4.0 delete mode 100644 scst_local/in-tree/Makefile-4.1 delete mode 100644 scst_local/in-tree/Makefile-4.2 delete mode 100644 scst_local/in-tree/Makefile-4.3 delete mode 100644 scst_local/in-tree/Makefile-4.4 delete mode 100644 scst_local/in-tree/Makefile-4.5 delete mode 100644 scst_local/in-tree/Makefile-4.6 diff --git a/iscsi-scst/doc/iscsi-scst-howto.txt b/iscsi-scst/doc/iscsi-scst-howto.txt index 7b9b5fffc..73d5fd50d 100644 --- a/iscsi-scst/doc/iscsi-scst-howto.txt +++ b/iscsi-scst/doc/iscsi-scst-howto.txt @@ -1,3 +1,8 @@ +This is a very quick HOWTO intended to provide a quick reference in how +to setup and configure iSCSI-SCST. For a deeper info please refer to +SCST and iSCSI-SCST README files. + + Installing and using iSCSI-SCST with scstadmin ============================================== @@ -13,16 +18,20 @@ command in a shell: svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst -While iSCSI-SCST works fine with an unpatched Linux kernel with the same -or better speed as other open source iSCSI targets, including IET, if -you want even better performance you have to patch and rebuild the -kernel. Select the patch according to your kernel version (2.6.38.x in -the example below): +While SCST and iSCSI-SCST work fine with an unpatched Linux kernel with +the same or better speed as other open source iSCSI targets, if you want +even better performance you need to patch and rebuild the kernel. Select +the patch according to your kernel version (2.6.38.x in the example +below): cd /usr/src/kernels/linux-2.6.38.8 patch -p1 < $HOME/scst/iscsi-scst/kernel/patches/put_page_callback-2.6.38.patch make clean +If you can't find put_page_callback for your kernel, then the patching +is not needed for it, so you can skip this and next (kernel rebuild and +reboot) steps. + Next, build and install the kernel: make && make modules @@ -39,14 +48,17 @@ Once the system is again up and running the next step is to build and install SCST, iSCSI-SCST and scstadmin. With most distros (including RHEL 6) you can do that by running the following command from the SCST directory: + make 2release make scst scst_install iscsi iscsi_install scstadm scstadm_install When using RHEL 5 or CentOS 5, use these commands instead: + make 2release make enable_proc make scst scst_install iscsi iscsi_install scstadm scstadm_install iSCSI-SCST includes the following components: + * kernel modules: iscsi-scst.ko scst.ko scst_vdisk.ko * iscsi-scstd - daemon * man pages * Obsolete configuration files located under iscsi-scst/etc/obsolete, need to be copied to @@ -56,24 +68,21 @@ iSCSI-SCST includes the following components: * initiators.deny - used for assigning specific initiators to targets * iscsi-scstd.conf - list of targets and their properties -2. Set up /etc/iscsi/initiatorname.iscsi - -The most convenient way to set up this file is to install the open-iscsi -package provided by your Linux distro first and then to run the shell commands -shown below. Verify the contents of the generated file. - - /etc/init.d/open-iscsi stop - { echo "InitiatorName=$(if [ -e /usr/sbin/iscsi-iname ]; then /usr/sbin/iscsi-iname; else /sbin/iscsi-iname; fi)"; - echo "InitiatorAlias=$(hostname)"; } >/etc/iscsi/initiatorname.iscsi - /etc/init.d/open-iscsi start - cat /etc/iscsi/initiatorname.iscsi - -3. Set up /etc/scst.conf +2. Set up /etc/scst.conf The scst.conf configuration file is loaded at system boot time by the -shell script /etc/init.d/scst. The target, device and LUN +shell script /etc/init.d/scst via scstadmin. The target, device and LUN configuration is defined in this file. +Generally, SCST and its components, including iSCSI-SCST, are kernel +modules, hence they are using kernel interface for configuring, sysfs. +However, using sysfs interface directly is cumbersome. Scstadmin utility +allows to use regular plain text interface instead. You can load a +config file into SCST sysfs using "scstadmin -config" and save currently +running configuration into scst.conf using "scstadmin -write_config". +See below the second section, if you want to use SCST sysfs interface +directly. + Here is the sample config file. Copy it in /etc/scst.conf HANDLER vdisk_fileio { @@ -98,17 +107,26 @@ TARGET_DRIVER iscsi { } } -Note that for each SCSI device LUN 0 must exist. This is required by the SCSI +Note that for each initiator LUN 0 must exist, hence you can't create +targets and initiator groups without LUN 0. This is required by the SCSI protocol and is also documented in SCST's README file. -Then run the following command: +Then to start scst and iscsi-scst services run the following command: /etc/init.d/scst start -You should have the working iSCSI-SCST now. Do the following steps if -you need to automatically configure it upon reboot. +You should have the working iSCSI-SCST now. If at any later time you +need to change scst.conf and reload it, you can run scstadmin directly: -4. Create soft links in /etc/init.d + scstadmin -config /etc/scst.conf + +or restart SCST: + + /etc/init.d/scst restart + +Do the following steps if you need to automatically configure SCST upon reboot. + +3. Create soft links in /etc/init.d This will make SCST to start automatically upon system boot. Use either chkconfig or update-rc.d, depending on the Linux distribution you are using. @@ -120,7 +138,7 @@ On openSUSE you can let SCST start automatically through the following commands: insserv scst -5. Restart SCST and iSCSI-SCST +4. Restart SCST and iSCSI-SCST If you don't want to reboot now, you can make the above settings effective via the following commands: @@ -131,14 +149,40 @@ the following commands: Installing and using iSCSI-SCST without using scstadmin via /sys interface ========================================================================== -First repeat steps 1 and 2 from the first section but leave out -"scstadm scstadm_install" from the make command in step 1. +This is advanced section you should not need for basic services. +Scstadmin should be fully sufficient for you. Use those steps only if +you need to do something too advanced for scstadmin. For instance, keep +your configuration is a database instead of plain file. -Next load the scst_disk and scst_vdisk kernel modules as follows: +In an iSCSI-SCST system, three components interact to export your +devices and file systems to iSCSI initiators on remote hosts: Targets, +LUNS, and Devices. A Target represents the host and acts as a container +for LUNs. A LUN (Logical Unit Number) represents the address of a Device +and provides access control for initiators, as well as acting as a +container for Devices. A Device represents the actual block device or +file system you wish to make available to initiators. You have to create +targets first, then create LUNs, then assign LUNs to targets, then +define devices and assign them to a LUN. Finally, you have to enable +your Targets and the SCST system. Once the steps (below) have been +completed, you should be able to find and access your exported devices +from authorized remote initiators. + +First repeat step 1 the first section but leave out "scstadm +scstadm_install" from the make command in step 1. + +Next load the required kernel modules as follows: modprobe scst_disk modprobe scst_vdisk modprobe iscsi-scst + +Module scst_disk allows to export local SCSI (SAS, etc.) devices in +pass-through mode, scst_vdisk allows to create virtual LUNs based on +files and block devices, module iscsi-scst is the main iSCSI-SCST +module. + +Then run iSCSI-SCST user space service: + iscsi-scstd @@ -181,9 +225,13 @@ echo "add_device disk1 filename=/disk1; nv_cache=1" >/sys/kernel/scst_tgt/handle This will add new FILEIO device disk1 with backend file /disk1 and NV_CACHE option enabled. +For a block device usually it is more efficient to use BLOCKIO handler: -Selecting devices to be used by SCST ------------------------------------- +echo "add_device dev1 filename=/dev/dev1" >/sys/kernel/scst_tgt/handlers/vdisk_blockio/mgmt + + +Listing currently registered SCST devices +----------------------------------------- You can see the list of available devices: @@ -227,6 +275,8 @@ disk1 Defining LUN masking -------------------- +LUN masking defines which LUNs which initiator can see. + In order to associate specific LUNs with target iqn.2007-05.com.example:storage.iscsi-scst-1, do the following: diff --git a/iscsi-scst/kernel/isert-scst/iser.h b/iscsi-scst/kernel/isert-scst/iser.h index 7b8c0536d..8531896ba 100644 --- a/iscsi-scst/kernel/isert-scst/iser.h +++ b/iscsi-scst/kernel/isert-scst/iser.h @@ -233,7 +233,10 @@ struct isert_connection { struct isert_device { struct ib_device *ib_dev; struct ib_pd *pd; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) struct ib_mr *mr; +#endif + u32 lkey; struct list_head devs_node; /* conn_list and refcnt protected by dev_list_mutex */ diff --git a/iscsi-scst/kernel/isert-scst/iser_pdu.c b/iscsi-scst/kernel/isert-scst/iser_pdu.c index 25ee75ddd..7a0810185 100644 --- a/iscsi-scst/kernel/isert-scst/iser_pdu.c +++ b/iscsi-scst/kernel/isert-scst/iser_pdu.c @@ -201,7 +201,7 @@ static int isert_alloc_for_rdma(struct isert_cmnd *pdu, int sge_cnt, isert_wr_set_fields(&pdu->wr[i], isert_conn, pdu); for (i = 0; i < sge_cnt; ++i) - pdu->sg_pool[i].lkey = isert_conn->isert_dev->mr->lkey; + pdu->sg_pool[i].lkey = isert_conn->isert_dev->lkey; goto out; diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index 52cbf8cc1..66339c62f 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -952,7 +952,9 @@ static struct isert_device *isert_device_create(struct ib_device *ib_dev) struct isert_device *isert_dev; int cqe_num, err; struct ib_pd *pd; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) struct ib_mr *mr; +#endif struct ib_cq *cq; char wq_name[64]; int i, j; @@ -996,19 +998,21 @@ static struct isert_device *isert_device_create(struct ib_device *ib_dev) goto fail_alloc_cq_desc; } - pd = ib_alloc_pd(ib_dev); + pd = ib_alloc_pd(ib_dev, 0); if (unlikely(IS_ERR(pd))) { err = PTR_ERR(pd); PRINT_ERROR("Failed to alloc iser dev pd, err:%d", err); goto fail_pd; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) mr = ib_get_dma_mr(pd, IB_ACCESS_LOCAL_WRITE); if (unlikely(IS_ERR(mr))) { err = PTR_ERR(mr); PRINT_ERROR("Failed to get dma mr, err: %d", err); goto fail_mr; } +#endif cqe_num = min(isert_dev->device_attr.max_cqe, ISER_CQ_ENTRIES); cqe_num = cqe_num / isert_dev->num_cqs; @@ -1088,7 +1092,12 @@ static struct isert_device *isert_device_create(struct ib_device *ib_dev) isert_dev->ib_dev = ib_dev; isert_dev->pd = pd; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) isert_dev->mr = mr; + isert_dev->lkey = mr->lkey; +#else + isert_dev->lkey = pd->local_dma_lkey; +#endif INIT_LIST_HEAD(&isert_dev->conn_list); @@ -1106,8 +1115,10 @@ fail_cq: if (isert_dev->cq_desc[j].cq_workqueue) destroy_workqueue(isert_dev->cq_desc[j].cq_workqueue); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ib_dereg_mr(mr); fail_mr: +#endif ib_dealloc_pd(pd); fail_pd: vfree(isert_dev->cq_desc); @@ -1150,9 +1161,11 @@ static void isert_device_release(struct isert_device *isert_dev) destroy_workqueue(cq_desc->cq_workqueue); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) err = ib_dereg_mr(isert_dev->mr); if (unlikely(err)) PRINT_ERROR("Failed to destroy mr, err:%d", err); +#endif ib_dealloc_pd(isert_dev->pd); vfree(isert_dev->cq_desc); diff --git a/iscsi-scst/kernel/nthread.c b/iscsi-scst/kernel/nthread.c index 4874c7c62..4c60d4b3c 100644 --- a/iscsi-scst/kernel/nthread.c +++ b/iscsi-scst/kernel/nthread.c @@ -727,7 +727,10 @@ restart: oldfs = get_fs(); set_fs(get_ds()); - res = sock_recvmsg(conn->sock, msg, read_size, + res = sock_recvmsg(conn->sock, msg, +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + read_size, +#endif MSG_DONTWAIT | MSG_NOSIGNAL); set_fs(oldfs); diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 b/qla2x00t/qla2x00-target/Makefile_in-tree similarity index 100% rename from qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 rename to qla2x00t/qla2x00-target/Makefile_in-tree diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 8f8692fff..6af9fd0de 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -114,7 +114,7 @@ function specialize_patch { fi | "$(dirname $0)/specialize-patch" \ ${specialize_patch_options} \ - -v kernel_version="${kver3}" \ + -v kernel_version="${kver}" \ -v SCSI_EXEC_REQ_FIFO_DEFINED="${scsi_exec_req_fifo_defined}" \ -v SCST_IO_CONTEXT="${scst_io_context}" else @@ -224,9 +224,15 @@ else include_fcst="false" fi +if [ -e "scst/kernel/in-tree/Makefile.scst-${kver}" ]; then + scst_makefile="Makefile.scst-${kver}" +else + scst_makefile="Makefile.scst" +fi + # Make sure that for kernel 2.6.26 and later the line # "#define CONFIG_SCST_PROC" is removed from scst/include/scst.h. -if grep -qw scst_sysfs scst/kernel/in-tree/Makefile.scst-${kver} \ +if grep -qw scst_sysfs scst/kernel/in-tree/${scst_makefile} \ || [ "${generating_upstream_patch}" = "true" ]; then specialize_patch_options="${specialize_patch_options} -v config_scst_proc_undefined=1" @@ -333,11 +339,21 @@ done # Directory drivers/ ( -add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" \ - "drivers/Kconfig" +if [ -e "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" ]; then + add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" \ + "drivers/Kconfig" +else + add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux.patch" \ + "drivers/Kconfig" +fi -add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch"\ - "drivers/Makefile" +if [ -e "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch" ]; then + add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch"\ + "drivers/Makefile" +else + add_patch "scst/kernel/in-tree/Makefile.drivers.Linux.patch"\ + "drivers/Makefile" +fi ) \ | process_patch "scst_01_drivers_kbuild.diff" @@ -357,8 +373,8 @@ else fi >"${tmp_Kconfig}" add_file "${tmp_Kconfig}" "drivers/scst/Kconfig" -tmp_Makefile="${tmpdir}/Makefile.scst-${kver}" -cat "scst/kernel/in-tree/Makefile.scst-${kver}" | \ +tmp_Makefile="${tmpdir}/${scst_makefile}" +cat "scst/kernel/in-tree/${scst_makefile}" | \ if [ "$include_proc_impl" != "true" ]; then grep -v 'scst_proc' else @@ -413,10 +429,16 @@ done # Directory drivers/scst/dev_handlers/ - -add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" \ - "drivers/scst/dev_handlers/Makefile" \ -| process_patch "scst_11_dev_handlers_makefile.diff" +if [ -e "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" ] +then + add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" \ + "drivers/scst/dev_handlers/Makefile" \ + | process_patch "scst_11_dev_handlers_makefile.diff" +else + add_file "scst/kernel/in-tree/Makefile.dev_handlers" \ + "drivers/scst/dev_handlers/Makefile" \ + | process_patch "scst_11_dev_handlers_makefile.diff" +fi for f in $(ls scst/src/dev_handlers/*.[ch] 2>/dev/null) do @@ -456,7 +478,7 @@ add_file "fcst/README" "Documentation/scst/README.fcst" \ # Directory drivers/scst/iscsi-scst/ # Make sure the file iscsi-scst/iscsi_scst_itf_ver.h is up to date. -make -s -C iscsi-scst include/iscsi_scst_itf_ver.h +make KVER=${kver3} -s -C iscsi-scst include/iscsi_scst_itf_ver.h ( for f in $(ls iscsi-scst/include/*h 2>/dev/null) @@ -517,8 +539,14 @@ if [ "${qla2x00t}" = "true" ]; then add_file "qla2x00t/qla2x_tgt_def.h" \ "drivers/scsi/qla2xxx/qla2x_tgt_def.h" - add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \ + if [ -e "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" ] + then + add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \ "drivers/scst/qla2xxx-target/Makefile" + else + add_file "qla2x00t/qla2x00-target/Makefile_in-tree" \ + "drivers/scst/qla2xxx-target/Makefile" + fi add_file "qla2x00t/qla2x00-target/Kconfig" \ "drivers/scst/qla2xxx-target/Kconfig" @@ -615,7 +643,11 @@ fi add_file "scst_local/in-tree/Kconfig" "drivers/scst/scst_local/Kconfig" - add_file "scst_local/in-tree/Makefile-${kver}" "drivers/scst/scst_local/Makefile" + if [ -e "scst_local/in-tree/Makefile-${kver}" ]; then + add_file "scst_local/in-tree/Makefile-${kver}" "drivers/scst/scst_local/Makefile" + else + add_file "scst_local/in-tree/Makefile" "drivers/scst/scst_local/Makefile" + fi add_file "scst_local/scst_local.c" "drivers/scst/scst_local/scst_local.c" ) \ diff --git a/scst/include/backport.h b/scst/include/backport.h index 98b21fd60..8bb03ea6c 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -25,6 +25,7 @@ #include /* kmalloc() */ #include /* sync_page_range() */ #include /* struct scsi_cmnd */ +#include /* */ @@ -512,6 +513,19 @@ typedef void (*rcu_callback_t)(struct rcu_head *); __kfree_rcu(&((ptr)->rcu_head), offsetof(typeof(*(ptr)), rcu_head)) #endif +/* */ +/* commit ed082d36 */ +#ifndef ib_alloc_pd +static inline struct ib_pd *ib_alloc_pd_backport(struct ib_device *device) +{ + return ib_alloc_pd(device); +} +#define ib_alloc_pd(device, flags) \ + ({ \ + (void)(flags), ib_alloc_pd_backport(device); \ + }) +#endif + /* */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) && \ diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch deleted file mode 100644 index 0d5a19f0f..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index aa43b91..c96860e 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch deleted file mode 100644 index 0cdb1a392..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index a2b902f..92e3d67 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch deleted file mode 100644 index 39d30a55e..000000000 --- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Kconfig b/drivers/Kconfig -index c70d6e4..0a4ed1b 100644 ---- a/drivers/Kconfig -+++ b/drivers/Kconfig -@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig" - - source "drivers/scsi/Kconfig" - -+source "drivers/scst/Kconfig" -+ - source "drivers/ata/Kconfig" - - source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.12.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux.patch similarity index 100% rename from scst/kernel/in-tree/Kconfig.drivers.Linux-3.12.patch rename to scst/kernel/in-tree/Kconfig.drivers.Linux.patch diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 b/scst/kernel/in-tree/Makefile.dev_handlers similarity index 100% rename from scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 rename to scst/kernel/in-tree/Makefile.dev_handlers diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.0 b/scst/kernel/in-tree/Makefile.dev_handlers-3.0 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.0 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.1 b/scst/kernel/in-tree/Makefile.dev_handlers-3.1 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.1 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.10 b/scst/kernel/in-tree/Makefile.dev_handlers-3.10 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.10 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.11 b/scst/kernel/in-tree/Makefile.dev_handlers-3.11 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.11 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.12 b/scst/kernel/in-tree/Makefile.dev_handlers-3.12 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.12 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.13 b/scst/kernel/in-tree/Makefile.dev_handlers-3.13 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.13 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.14 b/scst/kernel/in-tree/Makefile.dev_handlers-3.14 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.14 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.15 b/scst/kernel/in-tree/Makefile.dev_handlers-3.15 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.15 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.16 b/scst/kernel/in-tree/Makefile.dev_handlers-3.16 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.16 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.17 b/scst/kernel/in-tree/Makefile.dev_handlers-3.17 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.17 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.18 b/scst/kernel/in-tree/Makefile.dev_handlers-3.18 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.18 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.19 b/scst/kernel/in-tree/Makefile.dev_handlers-3.19 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.19 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.2 b/scst/kernel/in-tree/Makefile.dev_handlers-3.2 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.2 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.3 b/scst/kernel/in-tree/Makefile.dev_handlers-3.3 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.3 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.4 b/scst/kernel/in-tree/Makefile.dev_handlers-3.4 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.4 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.5 b/scst/kernel/in-tree/Makefile.dev_handlers-3.5 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.5 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.6 b/scst/kernel/in-tree/Makefile.dev_handlers-3.6 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.6 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.7 b/scst/kernel/in-tree/Makefile.dev_handlers-3.7 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.7 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.8 b/scst/kernel/in-tree/Makefile.dev_handlers-3.8 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.8 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.9 b/scst/kernel/in-tree/Makefile.dev_handlers-3.9 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-3.9 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.0 b/scst/kernel/in-tree/Makefile.dev_handlers-4.0 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.0 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.1 b/scst/kernel/in-tree/Makefile.dev_handlers-4.1 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.1 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.2 b/scst/kernel/in-tree/Makefile.dev_handlers-4.2 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.2 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.3 b/scst/kernel/in-tree/Makefile.dev_handlers-4.3 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.3 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.4 b/scst/kernel/in-tree/Makefile.dev_handlers-4.4 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.4 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.5 b/scst/kernel/in-tree/Makefile.dev_handlers-4.5 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.5 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.6 b/scst/kernel/in-tree/Makefile.dev_handlers-4.6 deleted file mode 100644 index f933b36f7..000000000 --- a/scst/kernel/in-tree/Makefile.dev_handlers-4.6 +++ /dev/null @@ -1,14 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ - scst_vdisk.o scst_raid.o scst_processor.o scst_user.o - -obj-$(CONFIG_SCST_DISK) += scst_disk.o -obj-$(CONFIG_SCST_TAPE) += scst_tape.o -obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o -obj-$(CONFIG_SCST_MODISK) += scst_modisk.o -obj-$(CONFIG_SCST_CHANGER) += scst_changer.o -obj-$(CONFIG_SCST_RAID) += scst_raid.o -obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o -obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o -obj-$(CONFIG_SCST_USER) += scst_user.o diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.12.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.15.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.16.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch deleted file mode 100644 index f7213ed4c..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ab93de8..45077ec 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch deleted file mode 100644 index 4d482c340..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.18.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index ebee555..17f67ae 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -134,6 +134,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch deleted file mode 100644 index 7c779740f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-3.9.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index a16a8d0..afc60b5 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -125,6 +125,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_NET) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch deleted file mode 100644 index 6bbacd12f..000000000 --- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/Makefile b/drivers/Makefile -index 527a6da..db2c24f 100644 ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -137,6 +137,7 @@ obj-$(CONFIG_SSB) += ssb/ - obj-$(CONFIG_BCMA) += bcma/ - obj-$(CONFIG_VHOST_RING) += vhost/ - obj-$(CONFIG_VLYNQ) += vlynq/ -+obj-$(CONFIG_SCST) += scst/ - obj-$(CONFIG_STAGING) += staging/ - obj-y += platform/ - #common clk code diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-3.19.patch b/scst/kernel/in-tree/Makefile.drivers.Linux.patch similarity index 100% rename from scst/kernel/in-tree/Makefile.drivers.Linux-3.19.patch rename to scst/kernel/in-tree/Makefile.drivers.Linux.patch diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.33 b/scst/kernel/in-tree/Makefile.scst similarity index 100% rename from scst/kernel/in-tree/Makefile.scst-2.6.33 rename to scst/kernel/in-tree/Makefile.scst diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.34 b/scst/kernel/in-tree/Makefile.scst-2.6.34 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.34 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.35 b/scst/kernel/in-tree/Makefile.scst-2.6.35 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.35 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.36 b/scst/kernel/in-tree/Makefile.scst-2.6.36 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.36 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.37 b/scst/kernel/in-tree/Makefile.scst-2.6.37 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.37 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.38 b/scst/kernel/in-tree/Makefile.scst-2.6.38 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.38 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.39 b/scst/kernel/in-tree/Makefile.scst-2.6.39 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-2.6.39 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.0 b/scst/kernel/in-tree/Makefile.scst-3.0 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.0 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.1 b/scst/kernel/in-tree/Makefile.scst-3.1 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.1 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.10 b/scst/kernel/in-tree/Makefile.scst-3.10 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.10 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.11 b/scst/kernel/in-tree/Makefile.scst-3.11 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.11 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.12 b/scst/kernel/in-tree/Makefile.scst-3.12 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.12 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.13 b/scst/kernel/in-tree/Makefile.scst-3.13 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.13 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.14 b/scst/kernel/in-tree/Makefile.scst-3.14 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.14 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.15 b/scst/kernel/in-tree/Makefile.scst-3.15 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.15 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.16 b/scst/kernel/in-tree/Makefile.scst-3.16 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.16 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.17 b/scst/kernel/in-tree/Makefile.scst-3.17 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.17 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.18 b/scst/kernel/in-tree/Makefile.scst-3.18 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.18 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.19 b/scst/kernel/in-tree/Makefile.scst-3.19 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.19 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.2 b/scst/kernel/in-tree/Makefile.scst-3.2 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.2 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.3 b/scst/kernel/in-tree/Makefile.scst-3.3 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.3 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.4 b/scst/kernel/in-tree/Makefile.scst-3.4 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.4 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.5 b/scst/kernel/in-tree/Makefile.scst-3.5 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.5 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.6 b/scst/kernel/in-tree/Makefile.scst-3.6 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.6 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.7 b/scst/kernel/in-tree/Makefile.scst-3.7 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.7 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.8 b/scst/kernel/in-tree/Makefile.scst-3.8 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.8 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-3.9 b/scst/kernel/in-tree/Makefile.scst-3.9 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-3.9 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.0 b/scst/kernel/in-tree/Makefile.scst-4.0 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.0 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.1 b/scst/kernel/in-tree/Makefile.scst-4.1 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.1 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.2 b/scst/kernel/in-tree/Makefile.scst-4.2 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.2 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.3 b/scst/kernel/in-tree/Makefile.scst-4.3 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.3 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.4 b/scst/kernel/in-tree/Makefile.scst-4.4 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.4 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.5 b/scst/kernel/in-tree/Makefile.scst-4.5 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.5 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/kernel/in-tree/Makefile.scst-4.6 b/scst/kernel/in-tree/Makefile.scst-4.6 deleted file mode 100644 index f4e0cc985..000000000 --- a/scst/kernel/in-tree/Makefile.scst-4.6 +++ /dev/null @@ -1,17 +0,0 @@ -ccflags-y += -Wno-unused-parameter - -scst-y += scst_copy_mgr.o -scst-y += scst_debug.o -scst-y += scst_dlm.o -scst-y += scst_event.o -scst-y += scst_lib.o -scst-y += scst_main.o -scst-y += scst_mem.o -scst-y += scst_no_dlm.o -scst-y += scst_pres.o -scst-y += scst_sysfs.o -scst-y += scst_targ.o -scst-y += scst_tg.o - -obj-$(CONFIG_SCST) += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \ - srpt/ scst_local/ diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c index 33a2cc7ed..34f5fb1be 100644 --- a/scst/src/dev_handlers/scst_user.c +++ b/scst/src/dev_handlers/scst_user.c @@ -1267,8 +1267,13 @@ static int dev_user_map_buf(struct scst_user_cmd *ucmd, unsigned long ubuff, (ucmd->cmd != NULL) ? ucmd->cmd->bufflen : -1); down_read(&tsk->mm->mmap_sem); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) rc = get_user_pages(ubuff, ucmd->num_data_pages, 1/*writable*/, 0/*don't force*/, ucmd->data_pages, NULL); +#else + rc = get_user_pages(ubuff, ucmd->num_data_pages, FOLL_WRITE, + ucmd->data_pages, NULL); +#endif up_read(&tsk->mm->mmap_sem); /* get_user_pages() flushes dcache */ diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 8340abc19..5017447d9 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -11897,28 +11897,33 @@ int scst_tape_generic_parse(struct scst_cmd *cmd) if (cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED && cmd->cdb[1] & 1) { int block_size = cmd->dev->block_size; - unsigned int ob = cmd->bufflen, od = cmd->data_len, oo = cmd->out_bufflen; + uint64_t b, ob; bool overflow; - cmd->bufflen = cmd->bufflen * block_size; - cmd->data_len = cmd->data_len * block_size; - cmd->out_bufflen = cmd->out_bufflen * block_size; + b = ((uint64_t)cmd->bufflen) * block_size; + ob = ((uint64_t)cmd->out_bufflen) * block_size; - overflow = (ob < (unsigned int)cmd->bufflen) || - (od < (unsigned int)cmd->data_len) || - (oo < (unsigned int)cmd->out_bufflen); + overflow = (b > 0xFFFFFFFF) || + (ob > 0xFFFFFFFF); if (unlikely(overflow)) { PRINT_WARNING("bufflen %u, data_len %llu or out_bufflen" " %u too large for device %s (block size" - " %u)", cmd->bufflen, cmd->data_len, - cmd->out_bufflen, cmd->dev->virt_name, - block_size); + " %u, b %llu, ob %llu)", cmd->bufflen, + cmd->data_len, cmd->out_bufflen, + cmd->dev->virt_name, block_size, b, ob); PRINT_BUFFER("CDB", cmd->cdb, cmd->cdb_len); scst_set_cmd_error(cmd, SCST_LOAD_SENSE( scst_sense_block_out_range_error)); res = -EINVAL; goto out; } + + cmd->bufflen = b; + cmd->out_bufflen = ob; + + /* cmd->data_len is 64-bit, so can't overflow here */ + BUILD_BUG_ON(sizeof(cmd->data_len) < 8); + cmd->data_len *= block_size; } if ((cmd->op_flags & (SCST_SMALL_TIMEOUT | SCST_LONG_TIMEOUT)) == 0) diff --git a/scst_local/in-tree/Makefile-2.6.35 b/scst_local/in-tree/Makefile similarity index 100% rename from scst_local/in-tree/Makefile-2.6.35 rename to scst_local/in-tree/Makefile diff --git a/scst_local/in-tree/Makefile-2.6.36 b/scst_local/in-tree/Makefile-2.6.36 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.36 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-2.6.37 b/scst_local/in-tree/Makefile-2.6.37 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.37 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-2.6.38 b/scst_local/in-tree/Makefile-2.6.38 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.38 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-2.6.39 b/scst_local/in-tree/Makefile-2.6.39 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-2.6.39 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.0 b/scst_local/in-tree/Makefile-3.0 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.0 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.1 b/scst_local/in-tree/Makefile-3.1 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.1 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.10 b/scst_local/in-tree/Makefile-3.10 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.10 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.11 b/scst_local/in-tree/Makefile-3.11 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.11 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.12 b/scst_local/in-tree/Makefile-3.12 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.12 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.13 b/scst_local/in-tree/Makefile-3.13 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.13 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.14 b/scst_local/in-tree/Makefile-3.14 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.14 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.15 b/scst_local/in-tree/Makefile-3.15 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.15 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.16 b/scst_local/in-tree/Makefile-3.16 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.16 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.17 b/scst_local/in-tree/Makefile-3.17 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.17 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.18 b/scst_local/in-tree/Makefile-3.18 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.18 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.19 b/scst_local/in-tree/Makefile-3.19 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.19 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.2 b/scst_local/in-tree/Makefile-3.2 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.2 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.3 b/scst_local/in-tree/Makefile-3.3 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.3 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.4 b/scst_local/in-tree/Makefile-3.4 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.4 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.5 b/scst_local/in-tree/Makefile-3.5 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.5 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.6 b/scst_local/in-tree/Makefile-3.6 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.6 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.7 b/scst_local/in-tree/Makefile-3.7 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.7 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.8 b/scst_local/in-tree/Makefile-3.8 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.8 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-3.9 b/scst_local/in-tree/Makefile-3.9 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-3.9 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.0 b/scst_local/in-tree/Makefile-4.0 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.0 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.1 b/scst_local/in-tree/Makefile-4.1 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.1 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.2 b/scst_local/in-tree/Makefile-4.2 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.2 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.3 b/scst_local/in-tree/Makefile-4.3 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.3 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.4 b/scst_local/in-tree/Makefile-4.4 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.4 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.5 b/scst_local/in-tree/Makefile-4.5 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.5 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scst_local/in-tree/Makefile-4.6 b/scst_local/in-tree/Makefile-4.6 deleted file mode 100644 index 8cbbbff63..000000000 --- a/scst_local/in-tree/Makefile-4.6 +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SCST_LOCAL) += scst_local.o - diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t index 703756e0f..e7ebc9b4d 100644 --- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t +++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t @@ -17,7 +17,8 @@ if ($> == 0) { "modprobe -r ib_srpt; " . "modprobe -r qla2x00tgt; " . "modprobe -r qla2xxx_scst; " . - "modprobe -r scst_vdisk"), 0); + "modprobe -r scst_vdisk; " . + "modprobe -r scst"), 0); ok(!(-d "/sys/module/scst")); diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/99-stop-scst.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/99-stop-scst.t index f8c2ded83..c2cad55cf 100644 --- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/99-stop-scst.t +++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/99-stop-scst.t @@ -15,7 +15,8 @@ if ($> == 0) { "modprobe -r ib_srpt; " . "modprobe -r qla2x00tgt; " . "modprobe -r qla2xxx_scst; " . - "modprobe -r scst_vdisk"), 0); + "modprobe -r scst_vdisk; " . + "modprobe -r scst"), 0); ok(!(-d "/sys/module/scst")); } else { ok(1); diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 94355b670..162c6c06f 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -5762,6 +5762,8 @@ sub configToAttr { if (!scalar keys %{$$config{$attr}}) { $attributes{$attr} = ''; } elsif ((keys %{$$config{$attr}}) > 1) { + immediateExit("Invalid configuration encountered. ". + "Attribute '$attr' has multiple values."); foreach my $value (keys %{$$config{$attr}}) { push @{$attributes{$attr}}, $value; } diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index 7e44341ee..83c3a40ec 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -958,7 +958,7 @@ static int srpt_post_recv(struct srpt_device *sdev, struct srpt_rdma_ch *ch, list.addr = ioctx->ioctx.dma + ioctx->ioctx.offset; list.length = srp_max_req_size; - list.lkey = sdev->mr->lkey; + list.lkey = sdev->lkey; wr.next = NULL; wr.sg_list = &list; @@ -1001,7 +1001,7 @@ static int srpt_post_send(struct srpt_rdma_ch *ch, list.addr = ioctx->ioctx.dma; list.length = len; - list.lkey = sdev->mr->lkey; + list.lkey = sdev->lkey; wr.next = NULL; wr.wr_id = encode_wr_id(SRPT_SEND, ioctx->ioctx.index); @@ -3299,7 +3299,7 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch, while (rsize > 0 && tsize > 0) { sge->addr = dma_addr; - sge->lkey = ch->sport->sdev->mr->lkey; + sge->lkey = ch->sport->sdev->lkey; if (rsize >= dma_len) { sge->length = @@ -4345,17 +4345,22 @@ static void srpt_add_one(struct ib_device *device) sdev->dev_attr = device->attrs; #endif - sdev->pd = ib_alloc_pd(device); + sdev->pd = ib_alloc_pd(device, 0); if (IS_ERR(sdev->pd)) { pr_err("ib_alloc_pd() failed: %ld\n", PTR_ERR(sdev->pd)); goto free_dev; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) sdev->mr = ib_get_dma_mr(sdev->pd, IB_ACCESS_LOCAL_WRITE); if (IS_ERR(sdev->mr)) { pr_err("ib_get_dma_mr() failed: %ld\n", PTR_ERR(sdev->mr)); goto err_pd; } + sdev->lkey = sdev->mr->lkey; +#else + sdev->lkey = sdev->pd->local_dma_lkey; +#endif sdev->srq_size = min(max(srpt_srq_size, MIN_SRPT_SRQ_SIZE), sdev->dev_attr.max_srq_wr); @@ -4479,8 +4484,10 @@ err_ring: if (sdev->use_srq) ib_destroy_srq(sdev->srq); err_mr: +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ib_dereg_mr(sdev->mr); err_pd: +#endif ib_dealloc_pd(sdev->pd); free_dev: kfree(sdev); @@ -4552,7 +4559,9 @@ static void srpt_remove_one(struct ib_device *device, void *client_data) if (sdev->use_srq) ib_destroy_srq(sdev->srq); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) ib_dereg_mr(sdev->mr); +#endif ib_dealloc_pd(sdev->pd); kfree(sdev); diff --git a/srpt/src/ib_srpt.h b/srpt/src/ib_srpt.h index 70c2c1c4c..b410dd69e 100644 --- a/srpt/src/ib_srpt.h +++ b/srpt/src/ib_srpt.h @@ -442,7 +442,8 @@ struct srpt_port { * struct srpt_device - Information associated by SRPT with a single HCA. * @device: Backpointer to the struct ib_device managed by the IB core. * @pd: IB protection domain. - * @mr: L_Key (local key) with write access to all local memory. + * @mr: MR with write access to all local memory. + * @lkey: L_Key (local key) with write access to all local memory. * @srq: Per-HCA SRQ (shared receive queue). * @cm_id: Connection identifier. * @dev_attr: Attributes of the InfiniBand device as obtained during the @@ -456,10 +457,13 @@ struct srpt_port { struct srpt_device { struct ib_device *device; struct ib_pd *pd; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) struct ib_mr *mr; +#endif struct ib_srq *srq; struct ib_cm_id *cm_id; struct ib_device_attr dev_attr; + u32 lkey; int srq_size; bool use_srq; struct srpt_recv_ioctx **ioctx_ring; diff --git a/www/index.html b/www/index.html index eb7ed83f2..1c957a87e 100644 --- a/www/index.html +++ b/www/index.html @@ -148,6 +148,7 @@

Documentation

HTML

PDF

+

SCST overview slides

Gentoo HOWTO

HOWTO For iSCSI-SCST

Gentoo HOWTO For iSCSI-SCST