1. 25 9月, 2006 19 次提交
  2. 24 9月, 2006 21 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 4f5537de
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
        [SCSI] scsi_transport_fc: fixup netlink arguments
      4f5537de
    • J
      [SCSI] scsi_transport_fc: fixup netlink arguments · 1b73c4bb
      James Bottomley 提交于
      nlmsg_multicast now takes an extra allocation flag, so add it to
      the use in the fibre channel transport class.
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      1b73c4bb
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · f164c421
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (94 commits)
        [SCSI] SPI transport class: misc DV fixes
        [SCSI] Switch some more scsi drivers to pci_get_device and refcounted pci structures
        [SCSI] eata_pio cleanup and PCI fix
        [SCSI] aacraid: README update
        [SCSI] aacraid: remove scsi_remove_device
        [SCSI] aacraid: merge rx and rkt code
        [SCSI] aacraid: expose physical devices
        [SCSI] aacraid: misc cleanup
        [SCSI] zfcp: update maintainers file
        [SCSI] zfcp: update maintainers file
        [SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
        [SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
        [SCSI] zfcp: fix: use correct req_id in eh_abort_handler
        [SCSI] zfcp: create private slab caches to guarantee proper data alignment
        [SCSI] zfcp: remove zfcp_ccw_unregister function
        [SCSI] aic7xxx: pause sequencer before touching SBLKCTL
        [SCSI] aic7xxx: avoid checking SBLKCTL register for certain cards
        [SCSI] scsi_debug version 1.80
        [SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value
        [SCSI] aha152x: remove static host array
        ...
      f164c421
    • J
      Merge mulgrave-w:git/linux-2.6 · 1aedf2cc
      James Bottomley 提交于
      Conflicts:
      
      	include/linux/blkdev.h
      
      Trivial merge to incorporate tag prototypes.
      1aedf2cc
    • J
      [SCSI] SPI transport class: misc DV fixes · dfdc58ba
      James Bottomley 提交于
      Key more of the domain validation settings off the inquiry data from
      the disk (in particular, don't try IU or DT unless the disk claims to
      support them.
      
      Also add a new dv_in_progress flag to prevent recursive DV.
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      dfdc58ba
    • D
      [SPARC64]: Update defconfig. · 6973ddde
      David S. Miller 提交于
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6973ddde
    • D
      [SPARC64]: Fix sched_clock() wrapping every ~17 seconds. · e17ba8f5
      David S. Miller 提交于
      Unfortunately, sparc64 doesn't have an easy way to do a "64 X 64 -->
      128" bit multiply like PowerPC and IA64 do.  We were doing a
      "64 X 64 --> 64" bit multiple which causes overflow very quickly with
      a 30-bit quotient shift.
      
      So use a quotientshift count of 10 instead of 30, just like x86 and
      ARM do.
      
      This also fixes the wrapping of printk timestamp values every ~17
      seconds.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e17ba8f5
    • A
    • A
      [SCSI] eata_pio cleanup and PCI fix · 1a68d41a
      Alan Cox 提交于
      This started as a PCI reference fixup but to do that I need to build it,
      to build it I need to fix it and its full of 32bitisms and uglies.
      
      It has been resurrected, I'm not sure if this is a thank you for the
      work on the license stuff or punishment for some unknown misdeed however
      8). I've also fixed a memory scribble in the init code.
      
      One oddity - the changes from HZ * to constants are deliberate. Whoever
      originally wrote the code (or cleaned it up) used HZ for a cycle timing
      loop even though is not HZ related. I've put it back to the counts used
      in the old days when the driver was most used.
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      1a68d41a
    • M
      [SCSI] aacraid: README update · 2538363e
      Mark Haverkamp 提交于
      Received from Mark Salyzyn:
      
      This patch to the driver's documentation adds a few new product entries,
      sorts the entries on OEM lines first for easy searching, followed by
      product id order to make it easier to compare against the open source
      pci list. The driver has 'family match' so is somewhat future proof, no
      code changes are required to recognize the new products.
      Signed-off-by: NMark Haverkamp <markh@osdl.org>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      2538363e
    • M
      [SCSI] aacraid: remove scsi_remove_device · ac5826ca
      Mark Haverkamp 提交于
      Received from Mark Salyzyn:
      
      Until the system is stabilized, I am suggesting the enclosed
      modification to prevent the driver from tickling the panic. Once sysfs
      and friends are stabilized, the patch may be backed out. We have yet to
      evaluate if we really want to relinquish existing Scsi Devices in any
      case, holding on to them as configuration of arrays comes and goes makes
      some sense as well. As a result, we have opted to pull the lines rather
      than comment them in legacy.
      Signed-off-by: NMark Haverkamp <markh@osdl.org>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      ac5826ca
    • M
      [SCSI] aacraid: merge rx and rkt code · 76a7f8fd
      Mark Haverkamp 提交于
      Received from Mark Salyzyn:
      
      The only real difference between the rkt and rx platform modules is the
      offset of the message registers. This patch recognizes this similarity
      and simplifies the driver to reduce it's code footprint and to improve
      maintainability by reducing the code duplication.
      
      Visibly, the 'rkt.c' portion of this patch looks more complicated than
      it really is. View it as retaining the rkt-only specifics of the
      interface.
      Signed-off-by: NMark Haverkamp <markh@osdl.org>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      76a7f8fd
    • M
      [SCSI] aacraid: expose physical devices · 653ba58d
      Mark Haverkamp 提交于
      Received from Mark Salyzyn:
      
      I am placing this functionality into an insmod parameter. Normally the physical
      components are exported to sg, and are blocked from showing up in sd.
      
      Note that the pass-through I/O path via the driver through the Firmware to the
      physical disks is not an optimized path, the card is designed for Hardware
      RAID, elevator sorting and caching. This should not be used as a means for
      utilizing the aacraid based controllers as a generic scsi/SATA/SAS controller,
      performance should suck by a few percentage points, any RAID meta-data on the
      drives will confuse the controller about who owns the drives and there is a
      high risk of destroying content in both directions. Unreliable and for
      experimentation or strange controlled circumstances only.
      Signed-off-by: NMark Haverkamp <markh@osdl.org>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      653ba58d
    • M
      [SCSI] aacraid: misc cleanup · 65101355
      Mark Haverkamp 提交于
      Received from Mark Salyzyn:
      
      Basically cleanup, nothing here will have an affect. Adjusting some
      error codes, removing superfluous definitions and code fragments.
      Signed-off-by: NMark Haverkamp <markh@osdl.org>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      65101355
    • L
      Merge git://git.infradead.org/mtd-2.6 · 1ab9dd09
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6:
        [MTD] Whitespace cleanup in SSFDC driver.
        [MTD] SSFDC translation layer minor cleanup
        [MTD] Fix dependencies with CONFIG_MTD=m
      1ab9dd09
    • L
      Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · f7425b16
      Linus Torvalds 提交于
      * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)
        [ALSA] intel8x0m - Free irq in suspend
        [ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig
        [ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII
        [ALSA] ES1938: remove duplicate field initialization
        [ALSA] usb-audio: increase number of packets per URB
        [ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
        [ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()
        [ALSA] hda-codec - Fix mic input with STAC92xx codecs
        [ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] hda-codec - Support multiple headphone pins
        [ALSA] hda_intel prefer 24bit instead of 20bit
        [ALSA] hda-codec - Add vendor ids for Motorola and Conexant
        [ALSA] hda-codec - Add device id for Motorola si3054-compatible codec
        [ALSA] Add missing compat ioctls for ALSA control API
        [ALSA] powermac - Fix Oops when conflicting with aoa driver
        [ALSA] aoa: add locking to tas codec
        [ALSA] hda-intel - Fix suspend/resume with MSI
        ...
      f7425b16
    • L
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · 9f261e01
      Linus Torvalds 提交于
      * git://git.linux-nfs.org/pub/linux/nfs-2.6: (74 commits)
        NFS: unmark NFS direct I/O as experimental
        NFS: add comments clarifying the use of nfs_post_op_update()
        NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers
        NFS: Use SEEK_END instead of hardcoded value
        NFSv4: When mounting with a port=0 argument, substitute port=2049
        NFSv4: Poll more aggressively when handling NFS4ERR_DELAY
        NFSv4: Handle the condition NFS4ERR_FILE_OPEN
        NFSv4: Retry lease recovery if it failed during a synchronous operation.
        NFS: Don't invalidate the symlink we just stuffed into the cache
        NFS: Make read() return an ESTALE if the file has been deleted
        NFSv4: It's perfectly legal for clp to be NULL here....
        NFS: nfs_lookup - don't hash dentry when optimising away the lookup
        SUNRPC: Fix Oops in pmap_getport_done
        SUNRPC: Add refcounting to the struct rpc_xprt
        SUNRPC: Clean up soft task error handling
        SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errors
        SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status
        Fix a referral error Oops
        NFS: NFS_ROOT should use the new rpc_create API
        NFS: Fix up compiler warnings on 64-bit platforms in client.c
        ...
      
      Manually resolved conflict in net/sunrpc/xprtsock.c
      9f261e01
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a4c12d6c
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits)
        [IPV6] ADDRCONF: Mobile IPv6 Home Address support.
        [IPV6] ADDRCONF: Allow non-DAD'able addresses.
        [IPV6] NDISC: Fix is_router flag setting.
        [IPV6] ADDRCONF: Convert addrconf_lock to RCU.
        [IPV6] NDISC: Add proxy_ndp sysctl.
        [IPV6] NDISC: Set per-entry is_router flag in Proxy NA.
        [IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA.
        [IPV6]: Don't forward packets to proxied link-local address.
        [IPV6] NDISC: Handle NDP messages to proxied addresses.
        [NETFILTER]: PPTP conntrack: fix another GRE keymap leak
        [NETFILTER]: PPTP conntrack: fix GRE keymap leak
        [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types
        [NETFILTER]: PPTP conntrack: check call ID before changing state
        [NETFILTER]: PPTP conntrack: clean up debugging cruft
        [NETFILTER]: PPTP conntrack: consolidate header parsing
        [NETFILTER]: PPTP conntrack: consolidate header size checks
        [NETFILTER]: PPTP conntrack: simplify expectation handling
        [NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers
        [NETFILTER]: PPTP conntrack: fix header definitions
        [NETFILTER]: PPTP conntrack: remove more dead code
        ...
      a4c12d6c
    • H
      [CRYPTO] hmac: Fix error truncation by unlikely() · 73af07de
      Herbert Xu 提交于
      The error return values are truncated by unlikely so we need to
      save it first.  Thanks to Kyle Moffett for spotting this.
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      73af07de
    • S
      [SCSI] zfcp: update maintainers file · 9cbb8897
      Swen Schillig 提交于
      As Andreas stated he will not maintain the zfcp driver anymore.
      Instead I will take over the responsibility.
      Signed-off-by: NSwen Schillig <swen@vnet.ibm.com>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      9cbb8897
    • A
      [SCSI] zfcp: update maintainers file · 99005e91
      Andreas Herrmann 提交于
      Removed myself as maintainer of the s390 zfcp driver --
      I will not maintain it any longer.
      Signed-off-by: NAndreas Herrmann <aherrman@de.ibm.com>
      Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
      99005e91