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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (60 commits)
  [SCSI] lpfc 8.3.24: Extend BSG infrastructure and add link diagnostics
  [SCSI] lpfc 8.3.24: Add resource extent support
  [SCSI] lpfc 8.3.24: Add request-firmware support
  [SCSI] lpfc 8.3.24: Add SR-IOV control
  [SCSI] lpfc 8.3.24: Extended hardware support and support dump images
  [SCSI] lpfc 8.3.24: Miscellaneous Fixes and Corrections
  [SCSI] libsas: Add option for SATA soft reset
  [SCSI] libsas: check dev->gone before submitting sata i/o
  [SCSI] libsas: fix/amend device gone notification in sas_deform_port()
  [SCSI] MAINTAINERS update for SCSI (new email address)
  [SCSI] Fix Ultrastor asm snippet
  [SCSI] osst: fix warning
  [SCSI] osst: wrong index used in inner loop
  [SCSI] aic94xx: world-writable sysfs update_bios file
  [SCSI] MAINTAINERS: Add drivers/target/ entry
  [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions
  [SCSI] target: Convert REPORT_LUNs to use int_to_scsilun
  [SCSI] target: Fix task->task_execute_queue=1 clear bug + LUN_RESET OOPs
  [SCSI] target: Fix bug with task_sg chained transport_free_dev_tasks release
  [SCSI] target: Fix interrupt context bug with stats_lock and core_tmr_alloc_req
  ...

diff --combined MAINTAINERS
index a33b11560d3fa47d0f6af7fd3e160f04c2bbda76,c12c0c746cbfc17b4e2f80e996cec230b0bd3c53..b9f5aee3637522aca17ad427bc799e1318b22316
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -287,35 -287,35 +287,35 @@@ F:      sound/pci/ad1889.
  
  AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/AD5254
  S:    Supported
  F:    drivers/misc/ad525x_dpot.c
  
  AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/AD5398
  S:    Supported
  F:    drivers/regulator/ad5398.c
  
  AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/AD7142
  S:    Supported
  F:    drivers/input/misc/ad714x.c
  
  AD7877 TOUCHSCREEN DRIVER
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/AD7877
  S:    Supported
  F:    drivers/input/touchscreen/ad7877.c
  
  AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/AD7879
  S:    Supported
  F:    drivers/input/touchscreen/ad7879.c
@@@ -341,7 -341,7 +341,7 @@@ F: drivers/net/wireless/adm8211.
  
  ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/ADP5520
  S:    Supported
  F:    drivers/mfd/adp5520.c
@@@ -352,7 -352,7 +352,7 @@@ F: drivers/input/keyboard/adp5520-keys.
  
  ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/ADP5588
  S:    Supported
  F:    drivers/input/keyboard/adp5588-keys.c
@@@ -360,7 -360,7 +360,7 @@@ F: drivers/gpio/adp5588-gpio.
  
  ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/ADP8860
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
@@@ -387,7 -387,7 +387,7 @@@ F: drivers/hwmon/adt7475.
  
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 +L:    device-drivers[email protected]
  W:    http://wiki.analog.com/ADXL345
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
@@@ -483,13 -483,6 +483,13 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 +M:    Andreas Herrmann <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/fam15h_power
 +F:    drivers/hwmon/fam15h_power.c
 +
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  M:    Thomas Dahlmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -533,7 -526,7 +533,7 @@@ S: Maintaine
  F:    drivers/infiniband/hw/amso1100/
  
  ANALOG DEVICES INC ASOC CODEC DRIVERS
 -L:    [email protected]
 +L:    device-drivers[email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://wiki.analog.com/
  S:    Supported
@@@ -931,8 -924,6 +931,8 @@@ F: drivers/mmc/host/msm_sdcc.
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/platform/msm/
 +F:    drivers/*/pm8???-*
 +F:    include/linux/mfd/pm8xxx/
  T:    git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
  S:    Maintained
  
@@@ -2043,8 -2034,9 +2043,8 @@@ F:      net/ax25/ax25_timer.
  F:    net/ax25/sysctl_net_ax25.c
  
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 -M:    Tobias Ringstrom <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/networking/dmfe.txt
  F:    drivers/net/tulip/dmfe.c
  
@@@ -2253,10 -2245,10 +2253,10 @@@ F:   drivers/gpu/drm
  F:    include/drm/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Chris Wilson <[email protected]>
 +M:    Keith Packard <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2304,7 -2296,7 +2304,7 @@@ F:      net/bridge/netfilter/ebt*.
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <[email protected]>
  M:    Dustin Kirkland <[email protected]>
 -L:    ecryptfs[email protected]
 +L:    ecryptfs@vger.kernel.org
  W:    https://launchpad.net/ecryptfs
  S:    Supported
  F:    Documentation/filesystems/ecryptfs.txt
@@@ -2584,13 -2576,6 +2584,13 @@@ S:    Maintaine
  F:    drivers/hwmon/f75375s.c
  F:    include/linux/f75375s.h
  
 +FIREWIRE AUDIO DRIVERS
 +M:    Clemens Ladisch <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    sound/firewire/
 +
  FIREWIRE SUBSYSTEM
  M:    Stefan Richter <[email protected]>
  L:    [email protected]
@@@ -3581,16 -3566,9 +3581,16 @@@ M:    Andrew Morton <akpm@linux-foundation
  M:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    fs/jbd*/
 -F:    include/linux/ext*jbd*.h
 -F:    include/linux/jbd*.h
 +F:    fs/jbd/
 +F:    include/linux/ext3_jbd.h
 +F:    include/linux/jbd.h
 +
 +JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
 +M:    "Theodore Ts'o" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    fs/jbd2/
 +F:    include/linux/jbd2.h
  
  JSM Neo PCI based serial card
  M:    Breno Leitao <[email protected]>
@@@ -3613,9 -3591,10 +3613,9 @@@ F:     Documentation/hwmon/k8tem
  F:    drivers/hwmon/k8temp.c
  
  KCONFIG
 -M:    Roman Zippel <[email protected]>
 +M:    Michal Marek <[email protected]>
  L:    [email protected]
 -Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
  
@@@ -3726,7 -3705,7 +3726,7 @@@ KEYS/KEYRINGS
  M:    David Howells <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/keys.txt
 +F:    Documentation/security/keys.txt
  F:    include/linux/key.h
  F:    include/linux/key-type.h
  F:    include/keys/
@@@ -3738,7 -3717,7 +3738,7 @@@ M:      Mimi Zohar <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/trusted-type.h
  F:    security/keys/trusted.c
  F:    security/keys/trusted.h
@@@ -3749,7 -3728,7 +3749,7 @@@ M:      David Safford <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/encrypted-type.h
  F:    security/keys/encrypted.c
  F:    security/keys/encrypted.h
@@@ -3919,6 -3898,7 +3919,6 @@@ F:      drivers/*/*/*pasemi
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
  S:    Supported
  
  LIS3LV02D ACCELEROMETER DRIVER
@@@ -4154,7 -4134,6 +4154,7 @@@ M:      KAMEZAWA Hiroyuki <kamezawa.hiroyu@j
  L:    [email protected]
  S:    Maintained
  F:    mm/memcontrol.c
 +F:    mm/page_cgroup.c
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <[email protected]>
@@@ -5515,7 -5494,7 +5515,7 @@@ F:      drivers/scsi/sg.
  F:    include/scsi/sg.h
  
  SCSI SUBSYSTEM
- M:    "James E.J. Bottomley" <J[email protected]>
+ M:    "James E.J. Bottomley" <J[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
@@@ -5613,11 -5592,10 +5613,11 @@@ M:   James Morris <[email protected]
  M:    Eric Paris <[email protected]>
  L:    [email protected] (subscribers-only, general discussion)
  W:    http://selinuxproject.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 +T:    git git://git.infradead.org/users/eparis/selinux.git
  S:    Supported
  F:    include/linux/selinux*
  F:    security/selinux/
 +F:    scripts/selinux/
  
  APPARMOR SECURITY MODULE
  M:    John Johansen <[email protected]>
@@@ -6008,7 -5986,7 +6008,7 @@@ F:      Documentation/filesystems/spufs.tx
  F:    arch/powerpc/platforms/cell/spufs/
  
  SQUASHFS FILE SYSTEM
 -M:    Phillip Lougher <phillip@lougher.demon.co.uk>
 +M:    Phillip Lougher <phillip@squashfs.org.uk>
  L:    [email protected] (subscribers-only)
  W:    http://squashfs.org.uk
  S:    Maintained
@@@ -6084,6 -6062,17 +6084,17 @@@ F:    Documentation/filesystems/sysv-fs.tx
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
  
+ TARGET SUBSYSTEM
+ M:    Nicholas A. Bellinger <[email protected]>
+ L:    [email protected]
+ L:    http://groups.google.com/group/linux-iscsi-target-dev
+ W:    http://www.linux-iscsi.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
+ S:    Supported
+ F:    drivers/target/
+ F:    include/target/
+ F:    Documentation/target/
+ 
  TASKSTATS STATISTICS INTERFACE
  M:    Balbir Singh <[email protected]>
  S:    Maintained
@@@ -6817,13 -6806,6 +6828,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/hwmon/vt8231.c
  
 +VUB300 USB to SDIO/SD/MMC bridge chip
 +M:    Tony Olech <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mmc/host/vub300.c
 +
  W1 DALLAS'S 1-WIRE BUS
  M:    Evgeniy Polyakov <[email protected]>
  S:    Maintained

diff --combined drivers/scsi/qla4xxx/ql4_nx.c
index 03e522b2fe0be6f70f9bc4838ff109a789e1c0c1,e1085edd17796c5db6fdec7c68af8463308cc4da..fdfe27b3869807289d98c4cf75afef678a4ecf4f
--- 1/drivers/scsi/qla4xxx/ql4_nx.c
--- 2/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@@ -655,27 -655,6 +655,27 @@@ static int qla4_8xxx_pci_is_same_window
        return 0;
  }
  
 +#ifndef readq
 +static inline __u64 readq(const volatile void __iomem *addr)
 +{
 +      const volatile u32 __iomem *p = addr;
 +      u32 low, high;
 +
 +      low = readl(p);
 +      high = readl(p + 1);
 +
 +      return low + ((u64)high << 32);
 +}
 +#endif
 +
 +#ifndef writeq
 +static inline void writeq(__u64 val, volatile void __iomem *addr)
 +{
 +      writel(val, addr);
 +      writel(val >> 32, addr+4);
 +}
 +#endif
 +
  static int qla4_8xxx_pci_mem_read_direct(struct scsi_qla_host *ha,
                u64 off, void *data, int size)
  {
@@@ -964,12 -943,26 +964,26 @@@ qla4_8xxx_pinit_from_rom(struct scsi_ql
        /* Halt all the indiviual PEGs and other blocks of the ISP */
        qla4_8xxx_rom_lock(ha);
  
-       /* mask all niu interrupts */
+       /* disable all I2Q */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_I2Q + 0x10, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_I2Q + 0x14, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_I2Q + 0x18, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_I2Q + 0x1c, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_I2Q + 0x20, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_I2Q + 0x24, 0x0);
+ 
+       /* disable all niu interrupts */
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x40, 0xff);
        /* disable xge rx/tx */
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x70000, 0x00);
        /* disable xg1 rx/tx */
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x80000, 0x00);
+       /* disable sideband mac */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x90000, 0x00);
+       /* disable ap0 mac */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0xa0000, 0x00);
+       /* disable ap1 mac */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0xb0000, 0x00);
  
        /* halt sre */
        val = qla4_8xxx_rd_32(ha, QLA82XX_CRB_SRE + 0x1000);
@@@ -984,6 -977,7 +998,7 @@@
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x10, 0x0);
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x18, 0x0);
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x100, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x200, 0x0);
  
        /* halt pegs */
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_0 + 0x3c, 1);
@@@ -991,9 -985,9 +1006,9 @@@
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_2 + 0x3c, 1);
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_3 + 0x3c, 1);
        qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_4 + 0x3c, 1);
+       msleep(5);
  
        /* big hammer */
-       msleep(1000);
        if (test_bit(DPC_RESET_HA, &ha->dpc_flags))
                /* don't reset CAM block on reset */
                qla4_8xxx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0xfeffffff);