From 29ce83783cf63bb879ea48a6e2ec32e1e9131148 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Tue, 28 Jun 2011 01:15:50 +0000
Subject: [PATCH] Blocked revisions 3606-3609,3626-3633 via svnmerge

........
  r3606 | bvassche | 2011-06-22 15:18:39 -0400 (Wed, 22 Jun 2011) | 13 lines

  scstadmin: Multiple -write_config bug fixes.

  Bug fixes:
  - Do not write out the line "# Non-key attributes" for the top level if -nonkey
    has not been specified.
  - If -nonkey has been specified, write out the device handler creation time
    attributes too (blocksize, o_direct, read_only, removable, ...).
  - If -nonkey has been specified, write out the LUN creation time attributes
    too (read_only).

  Also, simplify the -write_config implementation by introducing the Perl
  subroutines serializeKeyAttr() and serializeNkAttr().
........
  r3607 | bvassche | 2011-06-22 15:28:15 -0400 (Wed, 22 Jun 2011) | 1 line

  ib_srpt: Remove two superfluous blank lines
........
  r3608 | bvassche | 2011-06-23 14:23:38 -0400 (Thu, 23 Jun 2011) | 1 line

  Kernel version updates
........
  r3609 | vlnb | 2011-06-23 20:46:02 -0400 (Thu, 23 Jun 2011) | 3 lines

  Docs updates. Update for qla2x00t-howto-debian.html was sent by Barry Schut <b.schut@iu.nl>
........
  r3626 | bvassche | 2011-06-25 15:13:50 -0400 (Sat, 25 Jun 2011) | 1 line

  ib_srpt: Eliminate the magic constant SRPT_DEF_SG_PER_WQE
........
  r3627 | bvassche | 2011-06-25 15:32:32 -0400 (Sat, 25 Jun 2011) | 6 lines

  ib_srpt: Works again on mthca (not tested yet). A quote from the OFED 1.2.5
  release notes (docs/mthca_release_notes.txt), section "3. Known Issues":

  3. In mem-free devices, RC QPs can be created with a maximum of (max_sge - 3)
     entries only.
........
  r3628 | bvassche | 2011-06-26 03:20:49 -0400 (Sun, 26 Jun 2011) | 1 line

  ib_srpt: Document known max_sge limitations
........
  r3629 | bvassche | 2011-06-26 09:33:09 -0400 (Sun, 26 Jun 2011) | 1 line

  ib_srpt: Inline srpt_release_channel()
........
  r3630 | bvassche | 2011-06-26 10:30:38 -0400 (Sun, 26 Jun 2011) | 1 line

  ib_srpt: Relax a BUG_ON() statement into WARN_ON()
........
  r3631 | bvassche | 2011-06-26 10:32:00 -0400 (Sun, 26 Jun 2011) | 1 line

  ib_srpt: Embed HCA name in srpt thread name
........
  r3632 | bvassche | 2011-06-26 10:46:23 -0400 (Sun, 26 Jun 2011) | 5 lines

  ib_srpt: Avoid that failed multipart RDMA transfers cause havoc.
  Multipart RDMA transfers can fail after one or more but not all RDMA transfers
  have been initiated because either an IB cable has been pulled or the ib_srpt
  kernel module has been unloaded while an RDMA transfer is being set up.
........
  r3633 | bvassche | 2011-06-26 10:57:11 -0400 (Sun, 26 Jun 2011) | 1 line

  ib_srpt: Update test documentation
........


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