1. 17 Oct, 2008 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://www.jni.nu/cris · b73b636e
      Linus Torvalds authored
      * 'for-linus' of git://www.jni.nu/cris:
        CRIS: proper defconfig setup
        [CRIS] Rename boot-linkscripts and fix the path to them.
      b73b636e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ed09441d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (39 commits)
        [SCSI] sd: fix compile failure with CONFIG_BLK_DEV_INTEGRITY=n
        libiscsi: fix locking in iscsi_eh_device_reset
        libiscsi: check reason why we are stopping iscsi session to determine error value
        [SCSI] iscsi_tcp: return a descriptive error value during connection errors
        [SCSI] libiscsi: rename host reset to target reset
        [SCSI] iscsi class: fix endpoint id handling
        [SCSI] libiscsi: Support drivers initiating session removal
        [SCSI] libiscsi: fix data corruption when target has to resend data-in packets
        [SCSI] sd: Switch kernel printing level for DIF messages
        [SCSI] sd: Correctly handle all combinations of DIF and DIX
        [SCSI] sd: Always print actual protection_type
        [SCSI] sd: Issue correct protection operation
        [SCSI] scsi_error: fix target reset handling
        [SCSI] lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events
        [SCSI] lpfc 8.2.8 v2 : Add sysfs control of target queue depth handling
        [SCSI] lpfc 8.2.8 v2 : Revert target busy in favor of transport disrupted
        [SCSI] scsi_dh_alua: remove REQ_NOMERGE
        [SCSI] lpfc 8.2.8 : update driver version to 8.2.8
        [SCSI] lpfc 8.2.8 : Add MSI-X support
        [SCSI] lpfc 8.2.8 : Update driver to use new Host byte error code DID_TRANSPORT_DISRUPTED
        ...
      ed09441d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · b225ee5b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
        ipv4: Add a missing rcu_assign_pointer() in routing cache.
        [netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit
        xen-netfront: Avoid unaligned accesses to IP header
        lmc: copy_*_user under spinlock
        [netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA
      b225ee5b
  2. 16 Oct, 2008 37 commits