public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] final scsi updates for 2.6.34-rc1
@ 2010-03-10 17:36 James Bottomley
  2010-03-12 18:10 ` Linus Torvalds
  0 siblings, 1 reply; 8+ messages in thread
From: James Bottomley @ 2010-03-10 17:36 UTC (permalink / raw)
  To: Andrew Morton, Linus Torvalds; +Cc: linux-scsi, linux-kernel

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [GIT PULL] final scsi updates for 2.6.34-rc1
  2010-03-10 17:36 [GIT PULL] final scsi updates for 2.6.34-rc1 James Bottomley
@ 2010-03-12 18:10 ` Linus Torvalds
  2010-03-12 18:27   ` James Bottomley
  0 siblings, 1 reply; 8+ messages in thread
From: Linus Torvalds @ 2010-03-12 18:10 UTC (permalink / raw)
  To: James Bottomley; +Cc: Andrew Morton, linux-scsi, linux-kernel



On Wed, 10 Mar 2010, James Bottomley wrote:
>
> 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [GIT PULL] final scsi updates for 2.6.34-rc1
  2010-03-12 18:10 ` Linus Torvalds
@ 2010-03-12 18:27   ` James Bottomley
  2010-03-12 18:34     ` Linus Torvalds
  2010-03-13 19:35     ` Ray Lee
  0 siblings, 2 replies; 8+ messages in thread
From: James Bottomley @ 2010-03-12 18:27 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andrew Morton, linux-scsi, linux-kernel

On Fri, 2010-03-12 at 10:10 -0800, Linus Torvalds wrote:
> 
> On Wed, 10 Mar 2010, James Bottomley wrote:
> >
> > 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.

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 <torvalds@linux-foundation.org>
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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [GIT PULL] final scsi updates for 2.6.34-rc1
  2010-03-12 18:27   ` James Bottomley
@ 2010-03-12 18:34     ` Linus Torvalds
  2010-03-12 18:40       ` Linus Torvalds
  2010-03-13 19:35     ` Ray Lee
  1 sibling, 1 reply; 8+ messages in thread
From: Linus Torvalds @ 2010-03-12 18:34 UTC (permalink / raw)
  To: James Bottomley; +Cc: Andrew Morton, linux-scsi, linux-kernel



On Fri, 12 Mar 2010, James Bottomley wrote:
> 
> 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [GIT PULL] final scsi updates for 2.6.34-rc1
  2010-03-12 18:34     ` Linus Torvalds
@ 2010-03-12 18:40       ` Linus Torvalds
  0 siblings, 0 replies; 8+ messages in thread
From: Linus Torvalds @ 2010-03-12 18:40 UTC (permalink / raw)
  To: James Bottomley; +Cc: Andrew Morton, linux-scsi, linux-kernel



On Fri, 12 Mar 2010, Linus Torvalds wrote:
> 
> 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [GIT PULL] final scsi updates for 2.6.34-rc1
  2010-03-12 18:27   ` James Bottomley
  2010-03-12 18:34     ` Linus Torvalds
@ 2010-03-13 19:35     ` Ray Lee
  2010-03-13 20:16       ` Douglas Gilbert
  1 sibling, 1 reply; 8+ messages in thread
From: Ray Lee @ 2010-03-13 19:35 UTC (permalink / raw)
  To: James Bottomley; +Cc: Linus Torvalds, Andrew Morton, linux-scsi, linux-kernel

On Fri, Mar 12, 2010 at 10:27 AM, James Bottomley wrote:
> I do always have a tree ready in the first days of the merge window.  It
> was, in fact, here:

[...]

> 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.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [GIT PULL] final scsi updates for 2.6.34-rc1
  2010-03-13 19:35     ` Ray Lee
@ 2010-03-13 20:16       ` Douglas Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Douglas Gilbert @ 2010-03-13 20:16 UTC (permalink / raw)
  To: Ray Lee
  Cc: James Bottomley, Linus Torvalds, Andrew Morton, linux-scsi,
	linux-kernel

Ray Lee wrote:
> On Fri, Mar 12, 2010 at 10:27 AM, James Bottomley wrote:
>> I do always have a tree ready in the first days of the merge window.  It
>> was, in fact, here:
> 
> [...]
> 
>> 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.

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] final scsi updates for 2.6.34-rc1
@ 2010-03-16 17:11 James Bottomley
  0 siblings, 0 replies; 8+ messages in thread
From: James Bottomley @ 2010-03-16 17:11 UTC (permalink / raw)
  To: Andrew Morton, Linus Torvalds; +Cc: linux-scsi, linux-kernel

OK, I think we've got understanding that this is the *second* pull
request from SCSI ... it's just all the changes that got flushed out
during the merge window, so I'm resubmitting it.

Going forwards, we're going to try to send in our last pull at the 11th
day, which means it needs to be in my scsi-misc tree by the 8th day of
the merge window (to get sufficient a work out in linux-next).  We're
also going to try to move as much stuff as we can from the second pull
to the first one, so this practice will be acceptable only if the second
pull is a lot smaller than the first one.

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2010-03-16 17:11 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-10 17:36 [GIT PULL] final scsi updates for 2.6.34-rc1 James Bottomley
2010-03-12 18:10 ` Linus Torvalds
2010-03-12 18:27   ` James Bottomley
2010-03-12 18:34     ` Linus Torvalds
2010-03-12 18:40       ` Linus Torvalds
2010-03-13 19:35     ` Ray Lee
2010-03-13 20:16       ` Douglas Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2010-03-16 17:11 James Bottomley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox