From 8d83e99f0b00b3338eeaa59efbc8f2f88d63c8bc Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Thu, 7 Jul 2011 21:39:14 +0000
Subject: [PATCH] Blocked revisions 3644-3651,3655,3660,3662 via svnmerge

........
  r3644 | vlnb | 2011-06-28 21:45:42 -0400 (Tue, 28 Jun 2011) | 9 lines

  Major cleanups:

   - SCST_CMD_STATE_* and SCST_MCMD_STATE_* constants converted to enums and made more readable

   - Dev handlers don't have to call scst_check_local_events() anymore, except if they implement internal queuing

  Other minor cleanups and fixes
........
  r3645 | vlnb | 2011-06-29 21:01:17 -0400 (Wed, 29 Jun 2011) | 8 lines

   - scst_check_local_events() should be called in scst_real_exec() and
     scst_local_exec(), because if a command passed in those procedures, it
     for sure was delayed in some list, so recheck if it was aborted is
     necessary.

   - Cleanup
........
  r3646 | bvassche | 2011-06-30 14:40:29 -0400 (Thu, 30 Jun 2011) | 6 lines

  scstadmin: Whitespace fixes for the -write_config changes introduced in r3606.

  Separate device handler key and non-key attributes with a single blank line
  instead of two. Indent <target>.<lun>.<attribute> with three tabs instead
  of four.
........
  r3647 | bvassche | 2011-07-01 15:19:20 -0400 (Fri, 01 Jul 2011) | 1 line

  ib_srpt: Zero-initialize QP attributes before invoking ib_modify_qp()
........
  r3648 | bvassche | 2011-07-01 15:26:11 -0400 (Fri, 01 Jul 2011) | 1 line

  ib_srpt: Log QP timeout if debugging is enabled
........
  r3649 | bvassche | 2011-07-02 07:36:44 -0400 (Sat, 02 Jul 2011) | 1 line

  ib_srpt: Increase RDMA completion time from 60s to 80s such that it is above the maximum time it can take for the HCA to deliver a completion (which is 60.129s with local ack timeout = 18 and retry_cnt = 7)
........
  r3650 | bvassche | 2011-07-02 07:54:14 -0400 (Sat, 02 Jul 2011) | 1 line

  ib_srpt: Remove a trailing tab
........
  r3651 | bvassche | 2011-07-02 07:55:51 -0400 (Sat, 02 Jul 2011) | 1 line

  scst: Avoid that the compiler complains about 'dev' being unused with CONFIG_SCST_STRICT_SERIALIZING enabled
........
  r3655 | bvassche | 2011-07-03 06:04:02 -0400 (Sun, 03 Jul 2011) | 1 line

  scst_vdisk: Only mark manually set thin_provisioned sysfs attributes as [key]
........
  r3660 | vlnb | 2011-07-07 15:52:17 -0400 (Thu, 07 Jul 2011) | 3 lines

  Web updates
........
  r3662 | vlnb | 2011-07-07 15:56:26 -0400 (Thu, 07 Jul 2011) | 3 lines

  Logging cleanup
........


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