From /pub/scm/linux/kernel/git/sfr/linux-next * [new branch] master -> linux-next Switched to branch "2.6.27-rc6-mc1" From /pub/scm/linux/kernel/git/torvalds/linux-2.6 * [new branch] master -> linus From . * branch linus -> FETCH_HEAD From /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * [new branch] master -> scsi-rc-fixes From . * branch scsi-rc-fixes -> FETCH_HEAD From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * [new branch] master -> scsi-misc From . * branch scsi-misc -> FETCH_HEAD From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 * [new branch] master -> scsi-post-merge From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 * [new branch] merge-base -> scsi-post-merge-baFirst, rewinding head to replay your worSwitched to branch "2.6.27-rc6-mc1" From . * branch scsi-post-merge -> FETCH_HEAD ueing (v3) Applying: [SCSI] qla4xxx: return SCSI_MLQUEUE_TARGET_BUSY when driver has detected session error Applying: [SCSI] qla2xxx: return SCSI_MLQUEUE_TARGET_BUSY when driver has detected rport error or race Applying: [SCSI] libiscsi: Use SCSI_MLQUEUE_TARGET_BUSY Applying: [SCSI] lpfc: use SCSI_MLQUEUE_TARGET_BUSY when catching the rport transition race Applying: [SCSI] fc class: unblock target after calling terminate callback (take 2) Applying: [SCSI] ibmvfc, qla2xxx, lpfc: remove scsi_target_unblock calls in terminate callbacks Applying: [SCSI] scsi: add transport host byte errors (v3) Applying: [SCSI] iscsi class, libiscsi and qla4xxx: convert to new transport host byte values Applying: [SCSI] fc class: Add support for new transport errors Applying: [SCSI] qla2xxx: use new host byte transport errors. Applying: [SCSI] block: separate failfast into multiple bits. Applying: [SCSI] modify scsi to handle new fail fast flags. Applying: [SCSI] lpfc 8.2.8 : Add kernel-doc function headers Applying: [SCSI] lpfc 8.2.8 : Miscellaneous Discovery Fixes Applying: [SCSI] lpfc 8.2.8 : Update driver for new SLI-3 features Applying: [SCSI] lpfc 8.2.8 : Miscellaneous Bug Fixes Applying: [SCSI] lpfc 8.2.8 : Add new FCOE hardware support Applying: [SCSI] lpfc 8.2.8 : Add support for PCI-EEH permanent disabling Applying: [SCSI] lpfc 8.2.8 : Update driver to use new Host byte error code DID_TRANSPORT_DISRUPTED Applying: [SCSI] lpfc 8.2.8 : Add MSI-X support Applying: [SCSI] lpfc 8.2.8 : update driver version to 8.2.8 Applying: scsi_dh_alua: remove REQ_NOMERGE Applying: lpfc 8.2.8 v2 : Revert target busy in favor of transport disrupted Applying: lpfc 8.2.8 v2 : Add sysfs control of target queue depth handling Applying: lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events Updating de0216f..c34b598 Fast forward block/blk-core.c | 11 +- drivers/md/dm-mpath.c | 2 +- drivers/md/multipath.c | 4 +- drivers/s390/block/dasd_diag.c | 2 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/block/dasd_fba.c | 2 +- drivers/scsi/constants.c | 3 +- drivers/scsi/device_handler/scsi_dh_alua.c | 3 +- drivers/scsi/device_handler/scsi_dh_emc.c | 3 +- drivers/scsi/device_handler/scsi_dh_hp_sw.c | 6 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 3 +- drivers/scsi/ibmvscsi/ibmvfc.c | 2 - drivers/scsi/libiscsi.c | 16 +- drivers/scsi/lpfc/lpfc.h | 96 ++- drivers/scsi/lpfc/lpfc_attr.c | 1375 +++++++++++++++++++++- drivers/scsi/lpfc/lpfc_crtn.h | 51 +- drivers/scsi/lpfc/lpfc_ct.c | 20 +- drivers/scsi/lpfc/lpfc_debugfs.c | 400 ++++++-- drivers/scsi/lpfc/lpfc_disc.h | 23 + drivers/scsi/lpfc/lpfc_els.c | 1712 +++++++++++++++++++++++++-- drivers/scsi/lpfc/lpfc_hbadisc.c | 241 ++++- drivers/scsi/lpfc/lpfc_hw.h | 183 +++- drivers/scsi/lpfc/lpfc_init.c | 924 +++++++++++---- drivers/scsi/lpfc/lpfc_mbox.c | 624 ++++++++-- drivers/scsi/lpfc/lpfc_mem.c | 116 ++- drivers/scsi/lpfc/lpfc_nl.h | 163 +++ drivers/scsi/lpfc/lpfc_nportdisc.c | 24 +- drivers/scsi/lpfc/lpfc_scsi.c | 514 ++++++++- drivers/scsi/lpfc/lpfc_scsi.h | 5 + drivers/scsi/lpfc/lpfc_sli.c | 1715 ++++++++++++++++++++++++--- drivers/scsi/lpfc/lpfc_sli.h | 1 + drivers/scsi/lpfc/lpfc_version.h | 6 +- drivers/scsi/lpfc/lpfc_vport.c | 168 +++- drivers/scsi/lpfc/lpfc_vport.h | 4 + drivers/scsi/qla2xxx/qla_attr.c | 1 - drivers/scsi/qla2xxx/qla_isr.c | 14 +- drivers/scsi/qla2xxx/qla_os.c | 26 +- drivers/scsi/qla4xxx/ql4_isr.c | 4 +- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/scsi.c | 10 +- drivers/scsi/scsi_error.c | 53 +- drivers/scsi/scsi_lib.c | 106 ++- drivers/scsi/scsi_priv.h | 1 + drivers/scsi/scsi_scan.c | 1 + drivers/scsi/scsi_transport_fc.c | 47 +- drivers/scsi/scsi_transport_iscsi.c | 4 +- drivers/scsi/scsi_transport_spi.c | 4 +- include/linux/bio.h | 25 +- include/linux/blkdev.h | 15 +- include/scsi/scsi.h | 6 + include/scsi/scsi_device.h | 10 + include/scsi/scsi_transport_fc.h | 8 +- 52 files changed, 7757 insertions(+), 1004 deletions(-) create mode 100644 drivers/scsi/lpfc/lpfc_nl.h ## # check ## No prior to diff against ## # label ## Created commit dde0671: 2.6.27-rc6-mc1 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/merge-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/merge-tree/log- ##