Merged revisions 5906-5909,5911,5915-5927,5930 via svnmerge from

svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/branches/3.0.x

........
  r5906 | bvassche | 2014-12-03 19:12:20 +0200 (Wed, 03 Dec 2014) | 1 line
  
  Update for kernel 3.17 (merge r5882 from trunk)
........
  r5907 | bvassche | 2014-12-03 19:13:06 +0200 (Wed, 03 Dec 2014) | 1 line
  
  Add kernel 3.17 build infrastructure (merge r5883 from trunk)
........
  r5908 | bvassche | 2014-12-03 19:14:42 +0200 (Wed, 03 Dec 2014) | 1 line
  
  scripts: Merge 5827:5907 from trunk
........
  r5909 | bvassche | 2014-12-03 19:41:09 +0200 (Wed, 03 Dec 2014) | 1 line
  
  Build fixes for RHEL 6.6 kernel 2.6.32-504 (merge r5908 from trunk)
........
  r5911 | bvassche | 2014-12-04 14:14:44 +0200 (Thu, 04 Dec 2014) | 1 line
  
  scripts/generate-kernel-patch: Swap two filters (merge r5910 from trunk)
........
  r5915 | bvassche | 2014-12-05 12:01:49 +0200 (Fri, 05 Dec 2014) | 1 line
  
  iscsi-scst/kernel/patches/rhel/put_page_callback-2.6.32-504.patch: Add (merge r5904 from trunk)
........
  r5916 | bvassche | 2014-12-05 12:22:05 +0200 (Fri, 05 Dec 2014) | 1 line
  
  nightly: Merge r5720:5915 from trunk
........
  r5917 | bvassche | 2014-12-05 12:30:54 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_lib: Fix READ POSITION parsing (merge r5740 from trunk)
........
  r5918 | bvassche | 2014-12-05 12:33:22 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Clean up __scst_resume_activity() (merge r5589 from trunk)
........
  r5919 | bvassche | 2014-12-05 12:49:20 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scstadmin regression tests: Merge r5475:5915 from trunk
........
  r5920 | bvassche | 2014-12-05 12:50:41 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scstadmin: Sync saved configuration files (merge r5793 from trunk)
........
  r5921 | bvassche | 2014-12-05 12:57:03 +0200 (Fri, 05 Dec 2014) | 1 line
  
  ib_srpt: Speed up kernel driver unloading after a cable pull (merge r5727 from trunk)
........
  r5922 | bvassche | 2014-12-05 14:24:23 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_local: Avoid that session deletion triggers a kernel warning (merge r5601 and 5631 from trunk)
........
  r5923 | bvassche | 2014-12-05 14:25:46 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_local: Set max_id to 1 (merge r5786 from trunk)
........
  r5924 | bvassche | 2014-12-05 14:55:32 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Add 64-bit LUN support (kernel 3.17 - merge r5587 from trunk)
........
  r5925 | bvassche | 2014-12-05 14:56:59 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_local: Add 64-bit LUN support (kernel 3.17 - merge r5588 from trunk)
........
  r5926 | bvassche | 2014-12-05 14:59:32 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Remove unused variables (merge r5585 from trunk)
........
  r5927 | bvassche | 2014-12-05 15:01:57 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Avoid complaints about unused variables (merge r5600 from trunk)
........
  r5930 | bvassche | 2014-12-09 14:34:50 +0200 (Tue, 09 Dec 2014) | 1 line
  
  rpm build: Add support for qla2x00t driver in QLogic git repository (merge r5929 from trunk)
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5992 d57e44dd-8a1f-0410-8b47-8ef2f437770f

scripts/specialize-patch

@@ -251,7 +251,7 @@ function evaluate(stmnt, pattern, arg, op, result) {
       sub(pattern, op[1] == 0 ? op[2] : op[1], stmnt)
     }
   
-    pattern="\\((-*[0-9]+)\\)"
+    pattern="\\([[:blank:]]*(-*[0-9]+)[[:blank:]]*\\)"
     while (match(stmnt, pattern, op) != 0)
     {
       sub(pattern, op[1], stmnt)
@@ -545,11 +545,17 @@ BEGIN {
     reset_hunk_state_variables()
     match($0, "^@@ -([0-9]*),([0-9]*) \\+([0-9]*),([0-9]*) @@(.*)$", h)
   }
-  else if (delete_next_blank_line && match($0, "^+$"))
+  else if (delete_next_blank_line && $0 == "+")
   {
     discard = 1
     delete_next_blank_line = 0
   }
+  else if (lines >= 2 && !match(line[lines-2], ":$") &&
+           line[lines-1] == "+\x9return;" && $0 == "+}")
+  {
+    line[lines-1] = $0
+    lines_less_added++
+  }
   else
   {
     delete_next_blank_line = 0