From 658a4ad513f79bf26949070d1892441e684ad578 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 17:14:21 +0000 Subject: [PATCH] Merge r7525 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7777 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- doc/scst_user_spec.sgml | 2 +- fcst/fcst.h | 1 + scstadmin/scstadmin.sysfs/scstadmin | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/scst_user_spec.sgml b/doc/scst_user_spec.sgml index 288461d68..75f601928 100644 --- a/doc/scst_user_spec.sgml +++ b/doc/scst_user_spec.sgml @@ -10,7 +10,7 @@ SCST user space device handler interface description Vladislav Bolkhovitin -Version 3.4.0 +Version 3.2.0 diff --git a/fcst/fcst.h b/fcst/fcst.h index e26cddf2e..1ae8b63c6 100644 --- a/fcst/fcst.h +++ b/fcst/fcst.h @@ -30,6 +30,7 @@ #define NEW_LIBFC_API #endif +<<<<<<< .working #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) || \ defined(CONFIG_SUSE_KERNEL) && \ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 2ff878f13..eb6c89347 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -1,6 +1,6 @@ #!/usr/bin/perl -$Version = 'SCST Configurator v3.4.0-pre1'; +$Version = 'SCST Configurator v3.3.0-pre1'; # Configures SCST #