1. 20 Dec, 2011 18 commits
  2. 19 Dec, 2011 19 commits
  3. 18 Dec, 2011 3 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 390f9985
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (22 commits)
        [SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority
        [SCSI] bnx2i: Fixed kernel panic caused by unprotected task->sc->request deref
        [SCSI] qla4xxx: check for failed conn setup
        [SCSI] qla4xxx: a small loop fix
        [SCSI] qla4xxx: fix flash/ddb support
        [SCSI] zfcp: return early from slave_destroy if slave_alloc returned early
        [SCSI] fcoe: Fix preempt count leak in fcoe_filter_frames()
        [SCSI] qla2xxx: Update version number to 8.03.07.12-k.
        [SCSI] qla2xxx: Submit all chained IOCBs for passthrough commands on request queue 0.
        [SCSI] qla2xxx: Correct fc_host port_state display.
        [SCSI] qla2xxx: Disable generating pause frames when firmware hang detected for ISP82xx.
        [SCSI] qla2xxx: Clear mailbox busy flag during premature mailbox completion for ISP82xx.
        [SCSI] qla2xxx: Encapsulate prematurely completing mailbox commands during ISP82xx firmware hang.
        [SCSI] qla2xxx: Display IPE error message for ISP82xx.
        [SCSI] qla2xxx: Return the correct value for a mailbox command if 82xx is in reset recovery.
        [SCSI] qla2xxx: Enable Minidump by default with default capture mask 0x1f.
        [SCSI] qla2xxx: Stop unconditional completion of mailbox commands issued in interrupt mode during firmware hang.
        [SCSI] qla2xxx: Revert back the request queue mapping to request queue 0.
        [SCSI] qla2xxx: Don't call alloc_fw_dump for ISP82XX.
        [SCSI] qla2xxx: Check for SCSI status on underruns.
        ...
      390f9985
    • Linus Torvalds's avatar
      Merge branch 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux · e34d6b4b
      Linus Torvalds authored
      * 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux:
        i2c-eg20t: correct the driver init order of pch_i2c_probe()
        I2C: OMAP: fix FIFO usage for OMAP4
        i2c-s3c2410: Fix return code of s3c24xx_i2c_parse_dt_gpio
        i2c: i2c-s3c2410: Add a cpu_relax() to busy wait for bus idle
      e34d6b4b
    • Yinghai Lu's avatar
      pci: Fix hotplug of Express Module with pci bridges · 497f16f2
      Yinghai Lu authored
      I noticed that hotplug of one setup does not work with recent change in
      pci tree.
      
      After checking the bridge conf setup, I noticed that the bridges get
      assigned but do not get enabled.
      
      The reason is the following commit, while simply ignores bridge
      resources when enabling a pci device:
      
      | commit bbef98ab
      | Author: Ram Pai <linuxram@us.ibm.com>
      | Date:   Sun Nov 6 10:33:10 2011 +0800
      |
      |    PCI: defer enablement of SRIOV BARS
      |...
      |    NOTE: Note, there is subtle change in the pci_enable_device() API.  Any
      |    driver that depends on SRIOV BARS to be enabled in pci_enable_device()
      |    can fail.
      
      Put back bridge resource and ROM resource checking to fix the problem.
      
      That should fix regression like BIOS does not assign correct resource to
      bridge.
      
      Discussion can be found at:
      	http://www.spinics.net/lists/linux-pci/msg12874.htmlSigned-off-by: default avatarYinghai Lu <yinghai@kernel.org>
      Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      497f16f2