Skip to contentSkip to conversation

final scsi updates for 2.6.34-rc1

GIT PULL New James Bottomley 5 participants 9 messages Mar 10, 2010 – Mar 13, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

OK, I know this is a bit late, but no-one told me the merge window was going to close early, but even if they had I'd have been unable to do anything about it, since I've been in transit from India all this week so far (don't ask ...).

The only commit added on Monday is a bug fix (vport sync issue), so I plead this tree was ready to roll on Sunday. The tree contains five driver updates (lpfc, bfa, ipr, hpsa and be2iscsi) plus an assortment of bug fixes.

The tree is available here:

master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git

The short changelog is:

Boaz Harrosh (1):
libosd: Fix unchecked err return found by smatch

Brian King (2):
ibmvfc: Add suspend/resume support
ibmvscsi: Add suspend/resume support

Gal Rosen (1):
scsi_transport_fc: Fix synchronization issue while deleting vport

Hannes Reinecke (1):
scsi_dh_emc: fix mode select request setup

James Bottomley (1):
raid_attrs: fix dependency problems

James Smart (7):
lpfc 8.3.10: Update Driver version to 8.3.10 lpfc 8.3.10: Added round robin FCF failover lpfc 8.3.10: Fix Discovery issues
lpfc 8.3.10: Added management for LP21000 through BSG. lpfc 8.3.10: Update SLI interface areas
lpfc 8.3.10: Fix user interface issues
lpfc 8.3.10: Fix Initialization issues

Jayamohan Kallickal (7):
be2iscsi: Alloc only one EQ if intr mode
be2iscsi: Fixing memory allocation for connection
be2iscsi: Remove debug code
be2iscsi: cleans up abort handling
be2iscsi: Fix for a possible udelay while holding lock
be2iscsi: Cleanup of resets for device and target
libiscsi: Make iscsi_eh_target_reset start with session reset

Krishna Gudipati (30):
bfa: Update the driver version to 2.1.2.1.
bfa: Remove unused header files and did some cleanup.
bfa: Handle SCSI IO underrun case.
bfa: FCS and include file changes.
bfa: Modified the portstats get/clear logic
bfa: Replace bfa_get_attr() with specific APIs
bfa: New portlog entries for events (FIP/FLOGI/FDISC/LOGO).
bfa: Rename pport to fcport in BFA FCS.
bfa: IOC fixes, check for IOC down condition.
bfa: In MSIX mode, ignore spurious RME interrupts when FCoE ports are in FW mismatch state.
bfa: Fix Command Queue (CPE) full condition check and ack CPE interrupt.
bfa: IOC recovery fix in fcmode.
bfa: AEN and byte alignment fixes.
bfa: Introduce a link notification state machine.
bfa: Added firmware save clear feature for BFA driver.
bfa: FCS authentication related changes.
bfa: PCI VPD, FIP and include file changes.
bfa: Fix to copy fpma MAC when requested by user space application.
bfa: RPORT state machine: direct attach mode fix.
bfa: Replace bfa_assert() with bfa_sm_fault()
bfa: Clear LL_HALT and PSS_ERR bit when IOC crashes.
bfa: IOC changes: Support faster recovery and split bfa_ioc.c into ASIC specific code.
bfa: Resume BFA operations after firmware mismatch is resolved.
bfa: Fix to allow creation of only 190 vports on CNA.
bfa: New interface to handle firmware upgrade scenario
bfa: Changes to support FDMI Driver Parameter
bfa: Enable new halt interrupt in BFA.
bfa: Enable IOC auto-recovery and IOC type fix.
bfa: Defined a new LPS event to clear virtual link on a vport
bfa: Added separate MSI-X module parameters.

Martin K. Petersen (1):
sd: Fix VPD buffer allocations

Mike Miller (1):
hpsa: remove scan thread

Stephen M. Cameron (8):
hpsa: remove unused members next, prev, and retry_count from command list structure.
hpsa: Increase the number of scatter gather elements supported.
hpsa: Clarify calculation of padding for commandlist structure
hpsa: mark hpsa_pci_init as __devinit
hpsa: return -ENOMEM, not -1
hpsa: fix scsi status mis-shift
hpsa: fix firmwart typo
hpsa: allow modifying device queue depth.

Wayne Boyer (9):
ipr: adds PCI ID definitions for new adapters
ipr: add support for new IOASCs
ipr: add support for multiple stages of initialization
ipr: implement shutdown changes and remove obsolete write cache parameter
ipr: add hardware assisted smart dump functionality
ipr: add error handling updates for the next generation chip
ipr: update the configuration table code for the next generation chip
ipr: define new offsets to registers for the next generation chip
ipr: add support for new adapter command structures for the next generation chip

The diffstat is:

 drivers/infiniband/ulp/iser/iscsi_iser.c           |    2 
 drivers/scsi/Kconfig                               |    6 
 drivers/scsi/be2iscsi/be_cmds.c                    |    7 
 drivers/scsi/be2iscsi/be_iscsi.c                   |    4 
 drivers/scsi/be2iscsi/be_main.c                    |  201 +-
 drivers/scsi/be2iscsi/be_main.h                    |   11 
 drivers/scsi/be2iscsi/be_mgmt.c                    |   14 
 drivers/scsi/be2iscsi/be_mgmt.h                    |    8 
 drivers/scsi/bfa/Makefile                          |    8 
 drivers/scsi/bfa/bfa_core.c                        |   19 
 drivers/scsi/bfa/bfa_fcport.c                      | 1709 +++++++++++---------
 drivers/scsi/bfa/bfa_fcs.c                         |   63 
 drivers/scsi/bfa/bfa_fcs_lport.c                   |   75 
 drivers/scsi/bfa/bfa_fcs_port.c                    |   11 
 drivers/scsi/bfa/bfa_fcs_uf.c                      |    8 
 drivers/scsi/bfa/bfa_hw_cb.c                       |   13 
 drivers/scsi/bfa/bfa_hw_ct.c                       |    9 
 drivers/scsi/bfa/bfa_intr.c                        |  111 -
 drivers/scsi/bfa/bfa_ioc.c                         |  762 ++-------
 drivers/scsi/bfa/bfa_ioc.h                         |   57 
 drivers/scsi/bfa/bfa_ioc_cb.c                      |  274 +++
 drivers/scsi/bfa/bfa_ioc_ct.c                      |  423 +++++
 drivers/scsi/bfa/bfa_iocfc.c                       |   24 
 drivers/scsi/bfa/bfa_iocfc.h                       |    3 
 drivers/scsi/bfa/bfa_ioim.c                        |   22 
 drivers/scsi/bfa/bfa_itnim.c                       |   30 
 drivers/scsi/bfa/bfa_lps.c                         |  134 +
 drivers/scsi/bfa/bfa_module.c                      |    4 
 drivers/scsi/bfa/bfa_modules_priv.h                |    2 
 drivers/scsi/bfa/bfa_port_priv.h                   |   57 
 drivers/scsi/bfa/bfa_priv.h                        |    2 
 drivers/scsi/bfa/bfa_rport.c                       |   26 
 drivers/scsi/bfa/bfa_trcmod_priv.h                 |   62 
 drivers/scsi/bfa/bfa_tskim.c                       |   14 
 drivers/scsi/bfa/bfad.c                            |  208 +-
 drivers/scsi/bfa/bfad_attr.c                       |   76 
 drivers/scsi/bfa/bfad_attr.h                       |    9 
 drivers/scsi/bfa/bfad_drv.h                        |   35 
 drivers/scsi/bfa/bfad_im.c                         |   53 
 drivers/scsi/bfa/bfad_im.h                         |    5 
 drivers/scsi/bfa/bfad_intr.c                       |   11 
 drivers/scsi/bfa/fabric.c                          |   59 
 drivers/scsi/bfa/fcbuild.h                         |    6 
 drivers/scsi/bfa/fcpim.c                           |   51 
 drivers/scsi/bfa/fcs_fabric.h                      |    2 
 drivers/scsi/bfa/fcs_fcpim.h                       |    5 
 drivers/scsi/bfa/fcs_lport.h                       |    7 
 drivers/scsi/bfa/fcs_port.h                        |    3 
 drivers/scsi/bfa/fcs_rport.h                       |    3 
 drivers/scsi/bfa/fcs_uf.h                          |    3 
 drivers/scsi/bfa/fcs_vport.h                       |    8 
 drivers/scsi/bfa/fdmi.c                            |   79 
 drivers/scsi/bfa/include/aen/bfa_aen.h             |   50 
 drivers/scsi/bfa/include/bfa.h                     |   22 
 drivers/scsi/bfa/include/bfa_svc.h                 |  101 -
 drivers/scsi/bfa/include/bfa_timer.h               |    2 
 drivers/scsi/bfa/include/bfi/bfi.h                 |    4 
 drivers/scsi/bfa/include/bfi/bfi_cbreg.h           |   16 
 drivers/scsi/bfa/include/bfi/bfi_ctreg.h           |   26 
 drivers/scsi/bfa/include/bfi/bfi_ioc.h             |    2 
 drivers/scsi/bfa/include/bfi/bfi_lps.h             |    8 
 drivers/scsi/bfa/include/bfi/bfi_pport.h           |  172 --
 drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h      |    4 
 drivers/scsi/bfa/include/cs/bfa_log.h              |    2 
 drivers/scsi/bfa/include/cs/bfa_plog.h             |    9 
 drivers/scsi/bfa/include/cs/bfa_sm.h               |    8 
 drivers/scsi/bfa/include/defs/bfa_defs_aen.h       |   10 
 drivers/scsi/bfa/include/defs/bfa_defs_auth.h      |   22 
 drivers/scsi/bfa/include/defs/bfa_defs_cee.h       |   14 
 drivers/scsi/bfa/include/defs/bfa_defs_driver.h    |    3 
 drivers/scsi/bfa/include/defs/bfa_defs_ethport.h   |    1 
 drivers/scsi/bfa/include/defs/bfa_defs_fcport.h    |   94 +
 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h |   32 
 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h   |   72 
 drivers/scsi/bfa/include/defs/bfa_defs_ioc.h       |    3 
 drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h     |   12 
 drivers/scsi/bfa/include/defs/bfa_defs_lport.h     |    4 
 drivers/scsi/bfa/include/defs/bfa_defs_mfg.h       |  111 +
 drivers/scsi/bfa/include/defs/bfa_defs_port.h      |   19 
 drivers/scsi/bfa/include/defs/bfa_defs_pport.h     |  151 +
 drivers/scsi/bfa/include/defs/bfa_defs_status.h    |   17 
 drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h       |    1 
 drivers/scsi/bfa/include/fcs/bfa_fcs.h             |    5 
 drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h       |    8 
 drivers/scsi/bfa/include/log/bfa_log_hal.h         |    6 
 drivers/scsi/bfa/include/log/bfa_log_linux.h       |   16 
 drivers/scsi/bfa/include/protocol/fc.h             |    5 
 drivers/scsi/bfa/include/protocol/pcifw.h          |   75 
 drivers/scsi/bfa/loop.c                            |    2 
 drivers/scsi/bfa/lport_api.c                       |    5 
 drivers/scsi/bfa/ms.c                              |   29 
 drivers/scsi/bfa/ns.c                              |   36 
 drivers/scsi/bfa/rport.c                           |   91 -
 drivers/scsi/bfa/rport_api.c                       |    2 
 drivers/scsi/bfa/rport_ftrs.c                      |   12 
 drivers/scsi/bfa/scn.c                             |   10 
 drivers/scsi/bfa/vport.c                           |   86 -
 drivers/scsi/bnx2i/bnx2i_iscsi.c                   |    2 
 drivers/scsi/cxgb3i/cxgb3i_iscsi.c                 |    2 
 drivers/scsi/device_handler/scsi_dh_emc.c          |    6 
 drivers/scsi/hpsa.c                                |  330 +--
 drivers/scsi/hpsa.h                                |    7 
 drivers/scsi/hpsa_cmd.h                            |   20 
 drivers/scsi/ibmvscsi/ibmvfc.c                     |   27 
 drivers/scsi/ibmvscsi/ibmvscsi.c                   |   19 
 drivers/scsi/ibmvscsi/ibmvscsi.h                   |    1 
 drivers/scsi/ibmvscsi/iseries_vscsi.c              |    6 
 drivers/scsi/ibmvscsi/rpa_vscsi.c                  |   13 
 drivers/scsi/ipr.c                                 | 1756 ++++++++++++++++-----
 drivers/scsi/ipr.h                                 |  467 ++++-
 drivers/scsi/iscsi_tcp.c                           |    2 
 drivers/scsi/libiscsi.c                            |   23 
 drivers/scsi/lpfc/lpfc.h                           |   10 
 drivers/scsi/lpfc/lpfc_attr.c                      |    7 
 drivers/scsi/lpfc/lpfc_bsg.c                       |  332 +++
 drivers/scsi/lpfc/lpfc_bsg.h                       |   12 
 drivers/scsi/lpfc/lpfc_crtn.h                      |    7 
 drivers/scsi/lpfc/lpfc_els.c                       |  142 +
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |  527 ++++--
 drivers/scsi/lpfc/lpfc_init.c                      |  277 ++-
 drivers/scsi/lpfc/lpfc_logmsg.h                    |    1 
 drivers/scsi/lpfc/lpfc_mbox.c                      |    8 
 drivers/scsi/lpfc/lpfc_scsi.c                      |   49 
 drivers/scsi/lpfc/lpfc_sli.c                       |  413 ++++
 drivers/scsi/lpfc/lpfc_sli.h                       |    1 
 drivers/scsi/lpfc/lpfc_sli4.h                      |   38 
 drivers/scsi/lpfc/lpfc_version.h                   |    2 
 drivers/scsi/lpfc/lpfc_vport.c                     |    7 
 drivers/scsi/osd/osd_initiator.c                   |    4 
 drivers/scsi/raid_class.c                          |    2 
 drivers/scsi/scsi_transport_fc.c                   |   24 
 drivers/scsi/sd.c                                  |    4 
 include/scsi/libiscsi.h                            |    3 
 133 files changed, 7204 insertions(+), 3525 deletions(-)

James

#1 lore raw

PATCH RESEND 1/2 scsi: fix/convert scsi_scan.c kernel-doc

From: Randy Dunlap <[email protected]>

scsi_scan.c: fix incorrectly formatted kernel-doc notation & convert documentation of 2 functions into kernel-doc.

---
 drivers/scsi/scsi_scan.c |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/scsi/scsi_scan.c +9 -17
@@ -1220,7 +1220,7 @@ static void scsi_sequential_lun_scan(str
 }
 
 /**
- * scsilun_to_int: convert a scsi_lun to an int
+ * scsilun_to_int - convert a scsi_lun to an int
  * @scsilun:	struct scsi_lun to be converted.
  *
  * Description:
@@ -1252,7 +1252,7 @@ int scsilun_to_int(struct scsi_lun *scsi
 EXPORT_SYMBOL(scsilun_to_int);
 
 /**
- * int_to_scsilun: reverts an int into a scsi_lun
+ * int_to_scsilun - reverts an int into a scsi_lun
  * @lun:        integer to be reverted
  * @scsilun:	struct scsi_lun to be set.
  *
@@ -1874,12 +1874,9 @@ void scsi_forget_host(struct Scsi_Host *
 	spin_unlock_irqrestore(shost->host_lock, flags);
 }
 
-/*
- * Function:    scsi_get_host_dev()
- *
- * Purpose:     Create a scsi_device that points to the host adapter itself.
- *
- * Arguments:   SHpnt   - Host that needs a scsi_device
+/**
+ * scsi_get_host_dev - Create a scsi_device that points to the host adapter itself
+ * @shost: Host that needs a scsi_device
  *
  * Lock status: None assumed.
  *
@@ -1892,7 +1889,7 @@ void scsi_forget_host(struct Scsi_Host *
  *
  *	Note - this device is not accessible from any high-level
  *	drivers (including generics), which is probably not
- *	optimal.  We can add hooks later to attach 
+ *	optimal.  We can add hooks later to attach.
  */
 struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
 {
@@ -1919,18 +1916,13 @@ struct scsi_device *scsi_get_host_dev(st
 }
 EXPORT_SYMBOL(scsi_get_host_dev);
 
-/*
- * Function:    scsi_free_host_dev()
- *
- * Purpose:     Free a scsi_device that points to the host adapter itself.
- *
- * Arguments:   SHpnt   - Host that needs a scsi_device
+/**
+ * scsi_free_host_dev - Free a scsi_device that points to the host adapter itself
+ * @sdev: Host device to be freed
  *
  * Lock status: None assumed.
  *
  * Returns:     Nothing
- *
- * Notes:
  */
 void scsi_free_host_dev(struct scsi_device *sdev)
 {
#2 lore raw

PATCH RESEND 2/2 scsi: update drivers & tools URL references

In reply to James Bottomley

From: Randy Dunlap <[email protected]>

Change torque.net references for SCSI drivers & tools to their current locations (sg.danny.cz/sg). Remove whitespace at ends of lines.

Same could be done for parport references at torque.net except that those files don't seem to have a home now.

Cc Douglas Gilbert <[email protected]>
---
 .mailmap                                |    2 
 Documentation/DocBook/scsi.tmpl         |    2 
 Documentation/scsi/scsi-generic.txt     |   30 ++---
 Documentation/scsi/scsi.txt             |   22 +--
 Documentation/scsi/scsi_mid_low_api.txt |  130 +++++++++++-----------
 MAINTAINERS                             |    2 
 drivers/scsi/Kconfig                    |    4 
 drivers/scsi/scsi_debug.c               |    2 
 include/scsi/sg.h                       |   19 +--
 9 files changed, 107 insertions(+), 106 deletions(-)
.mailmap +1 -1
@@ -34,7 +34,7 @@ David Brownell <[email protected]>
 David Woodhouse <[email protected]>
 Dmitry Eremin-Solenikov <[email protected]>
 Domen Puncer <[email protected]>
-Douglas Gilbert <[email protected]>
+Douglas Gilbert <[email protected]>
 Ed L. Cashin <[email protected]>
 Evgeniy Polyakov <[email protected]>
 Felipe W Damasio <[email protected]>
MAINTAINERS +1 -1
@@ -4705,7 +4705,7 @@ F:	drivers/scsi/sr*
 SCSI SG DRIVER
 M:	Doug Gilbert <[email protected]>
 L:	[email protected]
-W:	http://www.torque.net/sg
+W:	http://sg.danny.cz/sg/index.html
 S:	Maintained
 F:	drivers/scsi/sg.c
 F:	include/scsi/sg.h
include/scsi/sg.h +10 -9
@@ -16,7 +16,7 @@ Version 2 and 3 extensions to driver:
     Version: 3.5.34 (20060920)
     This version is for 2.6 series kernels.
 
-    For a full changelog see http://www.torque.net/sg
+    For a full changelog see http://sg.danny.cz/sg/index.html
 
 Map of SG verions to the Linux kernels in which they appear:
        ----------        ----------------------------------
@@ -44,28 +44,29 @@ Major new features in SG 3.x driver (cf 
  ** N.B. To use direct IO 'echo 1 > /proc/scsi/sg/allow_dio' or
          'echo 1 > /sys/module/sg/parameters/allow_dio' is needed.
          That attribute is 0 by default. **
- 
- Historical note: this SCSI pass-through driver has been known as "sg" for 
+
+ Historical note: this SCSI pass-through driver has been known as "sg" for
  a decade. In broader kernel discussions "sg" is used to refer to scatter
  gather techniques. The context should clarify which "sg" is referred to.
 
  Documentation
  =============
  A web site for the SG device driver can be found at:
-	http://www.torque.net/sg  [alternatively check the MAINTAINERS file]
+	http://sg.danny.cz/sg/index.html
+	[alternatively check the MAINTAINERS file]
  The documentation for the sg version 3 driver can be found at:
- 	http://www.torque.net/sg/p/sg_v3_ho.html
+ 	http://sg.danny.cz/sg/p/scsi-generic_v3.txt
  This is a rendering from DocBook source [change the extension to "sgml"
  or "xml"]. There are renderings in "ps", "pdf", "rtf" and "txt" (soon).
  The SG_IO ioctl is now found in other parts kernel (e.g. the block layer).
- For more information see http://www.torque.net/sg/sg_io.html
+ For more information see http://sg.danny.cz/sg/sg_io.html
 
  The older, version 2 documents discuss the original sg interface in detail:
-	http://www.torque.net/sg/p/scsi-generic.txt
-	http://www.torque.net/sg/p/scsi-generic_long.txt
+	http://sg.danny.cz/sg/p/scsi-generic.txt
+	http://sg.danny.cz/sg/p/scsi-generic_long.txt
  Also available: <kernel_source>/Documentation/scsi/scsi-generic.txt
 
- Utility and test programs are available at the sg web site. They are 
+ Utility and test programs are available at the sg web site. They are
  packaged as sg3_utils (for the lk 2.4 and 2.6 series) and sg_utils
  (for the lk 2.2 series).
 */
drivers/scsi/Kconfig +2 -2
@@ -1594,8 +1594,8 @@ config SCSI_DEBUG
 	  each with multiple dummy SCSI devices (disks). It defaults to one
 	  host adapter with one dummy SCSI disk. Each dummy disk uses kernel
 	  RAM as storage (i.e. it is a ramdisk). To save space when multiple
-	  dummy disks are simulated, they share the same kernel RAM for 
-	  their storage. See <http://www.torque.net/sg/sdebug.html> for more
+	  dummy disks are simulated, they share the same kernel RAM for
+	  their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more
 	  information. This driver is primarily of use to those testing the
 	  SCSI and block subsystems. If unsure, say N.
 
drivers/scsi/scsi_debug.c +1 -1
@@ -12,7 +12,7 @@
  *  SAS disks.
  *
  *
- *  For documentation see http://www.torque.net/sg/sdebug26.html
+ *  For documentation see http://sg.danny.cz/sg/sdebug26.html
  *
  *   D. Gilbert (dpg) work for Magneto-Optical device test [20010421]
  *   dpg: work for devfs large number of disks [20010809]
Documentation/DocBook/scsi.tmpl +1 -1
@@ -393,7 +393,7 @@
         </para>
         <para>
           For documentation see
-          <ulink url='http://www.torque.net/sg/sdebug26.html'>http://www.torque.net/sg/sdebug26.html</ulink>
+          <ulink url='http://sg.danny.cz/sg/sdebug26.html'>http://sg.danny.cz/sg/sdebug26.html</ulink>
         </para>
 <!-- !Edrivers/scsi/scsi_debug.c -->
       </sect2>
Documentation/scsi/scsi.txt +11 -11
@@ -4,38 +4,38 @@ The Linux Documentation Project (LDP) ma
 the SCSI subsystem in the Linux kernel (lk) 2.4 series. See:
 http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO . The LDP has single
 and multiple page HTML renderings as well as postscript and pdf.
-It can also be found at http://www.torque.net/scsi/SCSI-2.4-HOWTO .
+It can also be found at http://sg.danny.cz/scsi/SCSI-2.4-HOWTO/index.html .
 
 
 Notes on using modules in the SCSI subsystem
 ============================================
-The scsi support in the linux kernel can be modularized in a number of 
+The scsi support in the linux kernel can be modularized in a number of
 different ways depending upon the needs of the end user.  To understand
 your options, we should first define a few terms.
 
-The scsi-core (also known as the "mid level") contains the core of scsi 
+The scsi-core (also known as the "mid level") contains the core of scsi
 support.  Without it you can do nothing with any of the other scsi drivers.
 The scsi core support can be a module (scsi_mod.o), or it can be built into
-the kernel. If the core is a module, it must be the first scsi module 
-loaded, and if you unload the modules, it will have to be the last one 
+the kernel. If the core is a module, it must be the first scsi module
+loaded, and if you unload the modules, it will have to be the last one
 unloaded.  In practice the modprobe and rmmod commands (and "autoclean")
 will enforce the correct ordering of loading and unloading modules in
 the SCSI subsystem.
 
-The individual upper and lower level drivers can be loaded in any order 
+The individual upper and lower level drivers can be loaded in any order
 once the scsi core is present in the kernel (either compiled in or loaded
 as a module).  The disk driver (sd_mod.o), cdrom driver (sr_mod.o),
-tape driver ** (st.o) and scsi generics driver (sg.o) represent the upper 
-level drivers to support the various assorted devices which can be 
-controlled.  You can for example load the tape driver to use the tape drive, 
+tape driver ** (st.o) and scsi generics driver (sg.o) represent the upper
+level drivers to support the various assorted devices which can be
+controlled.  You can for example load the tape driver to use the tape drive,
 and then unload it once you have no further need for the driver (and release
 the associated memory).
 
 The lower level drivers are the ones that support the individual cards that
 are supported for the hardware platform that you are running under. Those
 individual cards are often called Host Bus Adapters (HBAs). For example the
-aic7xxx.o driver is used to control all recent SCSI controller cards from 
-Adaptec. Almost all lower level drivers can be built either as modules or 
+aic7xxx.o driver is used to control all recent SCSI controller cards from
+Adaptec. Almost all lower level drivers can be built either as modules or
 built into the kernel.
 
 
Documentation/scsi/scsi_mid_low_api.txt +65 -65

408 lines not on this page · raw message

Documentation/scsi/scsi-generic.txt +15 -15
@@ -18,7 +18,7 @@ and examples.
 Major versions of the sg driver
 ===============================
 There are three major versions of sg found in the linux kernel (lk):
-      - sg version 1 (original) from 1992 to early 1999 (lk 2.2.5) . 
+      - sg version 1 (original) from 1992 to early 1999 (lk 2.2.5) .
 	It is based in the sg_header interface structure.
       - sg version 2 from lk 2.2.6 in the 2.2 series. It is based on
 	an extended version of the sg_header interface structure.
@@ -29,28 +29,28 @@ There are three major versions of sg fou
 Sg driver documentation
 =======================
 The most recent documentation of the sg driver is kept at the Linux
-Documentation Project's (LDP) site: 
+Documentation Project's (LDP) site:
 http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO
 This describes the sg version 3 driver found in the lk 2.4 series.
 The LDP renders documents in single and multiple page HTML, postscript
 and pdf. This document can also be found at:
-http://www.torque.net/sg/p/sg_v3_ho.html
+http://sg.danny.cz/sg/p/sg_v3_ho.html
 
 Documentation for the version 2 sg driver found in the lk 2.2 series can
-be found at http://www.torque.net/sg/p/scsi-generic.txt . A larger version
-is at:  http://www.torque.net/sg/p/scsi-generic_long.txt .
+be found at http://sg.danny.cz/sg/p/scsi-generic.txt . A larger version
+is at:  http://sg.danny.cz/sg/p/scsi-generic_long.txt .
 
 The original documentation for the sg driver (prior to lk 2.2.6) can be
-found at http://www.torque.net/sg/p/original/SCSI-Programming-HOWTO.txt
+found at http://sg.danny.cz/sg/p/original/SCSI-Programming-HOWTO.txt
 and in the LDP archives.
 
 A changelog with brief notes can be found in the
-/usr/src/linux/include/scsi/sg.h file. Note that the glibc maintainers copy 
-and edit this file (removing its changelog for example) before placing it 
-in /usr/include/scsi/sg.h . Driver debugging information and other notes 
+/usr/src/linux/include/scsi/sg.h file. Note that the glibc maintainers copy
+and edit this file (removing its changelog for example) before placing it
+in /usr/include/scsi/sg.h . Driver debugging information and other notes
 can be found at the top of the /usr/src/linux/drivers/scsi/sg.c file.
 
-A more general description of the Linux SCSI subsystem of which sg is a 
+A more general description of the Linux SCSI subsystem of which sg is a
 part can be found at http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO .
 
 
@@ -60,8 +60,8 @@ There are two packages of sg utilities:
   - sg3_utils   for the sg version 3 driver found in lk 2.4
   - sg_utils    for the sg version 2 (and original) driver found in lk 2.2
                 and earlier
-Both packages will work in the lk 2.4 series however sg3_utils offers more
-capabilities. They can be found at: http://www.torque.net/sg and 
+Both packages will work in the lk 2.4 series; however, sg3_utils offers more
+capabilities. They can be found at: http://sg.danny.cz/sg/index.html and
 freshmeat.net
 
 Another approach is to look at the applications that use the sg driver.
@@ -73,14 +73,14 @@ Mapping of Linux kernel versions to sg d
 Here is a list of linux kernels in the 2.4 series that had new version
 of the sg driver:
       lk 2.4.0 : sg version 3.1.17
-      lk 2.4.7 : sg version 3.1.19 
+      lk 2.4.7 : sg version 3.1.19
       lk 2.4.10 : sg version 3.1.20  **
-      lk 2.4.17 : sg version 3.1.22 
+      lk 2.4.17 : sg version 3.1.22
 
 ** There were 3 changes to sg version 3.1.20 by third parties in the
    next six linux kernel versions.
 
-For reference here is a list of linux kernels in the 2.2 series that had 
+For reference here is a list of linux kernels in the 2.2 series that had
 new version of the sg driver:
       lk 2.2.0 : original sg version [with no version number]
       lk 2.2.6 : sg version 2.1.31
#3 lore raw
In reply to James Bottomley
Quoted 5 lines · James Bottomley

OK, I know this is a bit late, but no-one told me the merge window was going to close early, but even if they had I'd have been unable to do anything about it, since I've been in transit from India all this week so far (don't ask ...).

I'm not going to pull.

The whole "a few days early" was literally aimed at you and some similar people who _always_ send the pull request late, literally the last days.

I'm fed up with it.

The damn thing should have been ready when the merge window _opened_, not just before closing. And now there _is_ a tree waiting for me for the next merge window. Goodie.

Linus

#4 lore raw
Quoted 10 lines · Linus Torvalds
Quoted 5 lines · James Bottomley

OK, I know this is a bit late, but no-one told me the merge window was going to close early, but even if they had I'd have been unable to do anything about it, since I've been in transit from India all this week so far (don't ask ...).

I'm not going to pull.

Quoted 8 lines

The whole "a few days early" was literally aimed at you and some similar people who _always_ send the pull request late, literally the last days.

I'm fed up with it.

The damn thing should have been ready when the merge window _opened_, not just before closing. And now there _is_ a tree waiting for me for the next merge window. Goodie.

I do always have a tree ready in the first days of the merge window. It was, in fact, here:

commit 654451748b779b28077d9058442d0f354251870d
Merge: 64d497f 77c9cfc
Author: Linus Torvalds <[email protected]>
Date: Fri Feb 26 16:55:27 2010 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

The slight problem is that I accumulate updates (like almost everyone else) from the few days before the merge window opened up until about the middle of the second week. That's what goes into the final pull, plus assorted bug fixes that showed up during the window.

I'm not objecting to a shorter merge window, just the unpredictability of all of this. The reason I delay the second pull until the last days of the merge window is so that the proposed changes get the maximum amount of shake down in linux-next ... and that usually means I close down the inclusion window about three days before the pull request goes out.

Personally, I do like the two week merge window, because it shakes out contributors to me who should have got their act together but didn't. If you don't like the way this works, fine ... I just need to know what the parameters are to adjust accordingly, so what is it now? A 10 day merge window?

James

#5 lore raw
Quoted 3 lines · James Bottomley

I'm not objecting to a shorter merge window, just the unpredictability of all of this.

If you read the 2.6.33 release notes, the unpredictability WAS THE WHOLE F*CKING POINT!

I'm tired of people being able to predict exactly when the merge window closes, and then using that to make the last days of the merge window be hell on me, and sending all the merges within about 24 hours of the closing.

So I'm not doing it.

If you had the major changes ready when the merge window opened, you should damn well have sent it in _then_.

End of story. I've told people before. The merge window is for _merging_, not for doing development. If you send me something the last day, then there is no "window" any more. And It is _really_ annoying to have fifty pull requests on the last day. I'm not going to take it any more.

And the thing is, all your explanations make things WORSE. You're basically saying that you're working exactly the way that I'm not going to accept.

So you're now going to get to wait six or seven weeks, because I refuse to work the way you have worked me for the last two years. I gave people a heads-up, and I probably shouldn't have. Some people noticed. And other people didn't even care, because they never gamed the system in the first place.

And some people - like you - both gamed the system, and didn't read the release notes, and now you complain. Tough.

And the fact that you complain about the very fact that you were gaming the system and now you can't because it's not predictable enough to game is what just proves my f*cking point!

Linus

#6 lore raw
Quoted 4 lines · Linus Torvalds

And the fact that you complain about the very fact that you were gaming the system and now you can't because it's not predictable enough to game is what just proves my f*cking point!

Btw, just to clarify for next time: I'm not even going to mention in the release notes how long the merge window is going to be.

Maybe I'll say "that's enough" after just one week, because the good people did what they do, and sent me a lot of merges early, there were no problems, and I might as well cut an -rc1 early since I have enough and I'd like to occasionally get a _shorter_ release cycle not just because the merge window was shorter, but because hopefully merging less might result in an easier stabilization cycle too.

Or maybe I'll be busy for a few days, and extend it past the two weeks just because I was in the middle of another flame war and needed a few extra days to catch up with real work.

Who knows? The point being that being predictable has caused problems. People have decided that they have an extra two weeks, and that the merge window isn't a window at all, it's just a day when -rc1 gets done.

Linus

#7 lore raw
In reply to James Bottomley
Quoted 2 lines · James Bottomley

I do always have a tree ready in the first days of the merge window.  It was, in fact, here:

[...]

Quoted 4 lines

The slight problem is that I accumulate updates (like almost everyone else) from the few days before the merge window opened up until about the middle of the second week.  That's what goes into the final pull, plus assorted bug fixes that showed up during the window.

You appear to being using git as a sort of baroque CVS. Fixes that arrive after the beginning of the merge window should be put into a separate branch other than the one ready for submission. Features that arrive after the beginning of the merge window should be placed into yet another branch destined for the next merge window.
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#8 lore raw
Quoted 11 lines · Ray Lee
Quoted 2 lines · James Bottomley

I do always have a tree ready in the first days of the merge window. It was, in fact, here:

[...]

Quoted 4 lines

The slight problem is that I accumulate updates (like almost everyone else) from the few days before the merge window opened up until about the middle of the second week. That's what goes into the final pull, plus assorted bug fixes that showed up during the window.

Quoted 5 lines

You appear to being using git as a sort of baroque CVS. Fixes that arrive after the beginning of the merge window should be put into a separate branch other than the one ready for submission. Features that arrive after the beginning of the merge window should be placed into yet another branch destined for the next merge window.

Ray,
I'm sure that James will appreciate your insightful advice. And Alan Cox is probably waiting for your thoughts on the design of serial device drivers.

Amazing that after yet another Linus rant, people crawl out of the woodwork to attack the victim.

Doug Gilbert