1. 23 9月, 2006 11 次提交
    • R
      IB/uverbs: Use idr_read_cq() where appropriate · ab108676
      Roland Dreier 提交于
      There were two functions that open-coded idr_read_cq() in terms of
      idr_read_uobj() rather than using the helper.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      ab108676
    • M
      IB/ipoib: Fix flush/start xmit race (from code review) · 9217b27b
      Michael S. Tsirkin 提交于
      Prevent flush task from freeing the ipoib_neigh pointer, while
      ipoib_start_xmit() is accessing the ipoib_neigh through the pointer it
      has loaded from the skb's hardware address.
      Signed-off-by: NMichael S. Tsirkin <mst@mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      9217b27b
    • M
      IB/mthca: Don't use privileged UAR for kernel access · 9fd558f4
      Michael S. Tsirkin 提交于
      Make kernel use UAR2 instead of UAR1 for hardware access: this adds
      sanity checking from the hardware side, without any performance cost.
      Signed-off-by: NMichael S. Tsirkin <mst@mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      9fd558f4
    • J
      IB/mthca: Fix lid used for sending traps · b2707573
      Jack Morgenstein 提交于
      The SM LID used to send traps to is incorrectly set to port LID.  This
      is a regression from 2.6.17 -- after a PortInfo MAD is received, no
      traps are sent to the SM LID.  The traps go to the loopback interface
      instead, and are dropped there.  The SM LID should be taken from the
      sm_lid of the PortInfo response.
      
      The bug was introduced by commit 12bbb2b7:
      	IB/mthca: Add client reregister event generation
      Signed-off-by: NJack Morgenstein <jackm@dev.mellanox.co.il>
      Signed-off-by: NMichael S. Tsirkin <mst@mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      b2707573
    • L
      Merge git://git.infradead.org/~dwmw2/hdroneline · e6e5fee1
      Linus Torvalds 提交于
      * git://git.infradead.org/~dwmw2/hdroneline:
        [HEADERS] One line per header in Kbuild files to reduce conflicts
      
      Manual (trivial) conflict resolution in include/asm-s390/Kbuild
      e6e5fee1
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 3e59ddff
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
        ocfs2: Remove overzealous BUG_ON()
        ocfs2: Don't print on unknown remote blocking call
        ocfs2: Remove EXPERIMENTAL dependency
        ocfs2: implement directory read-ahead
        ocfs2: properly update i_mtime on buffered write
        ocfs2: Fix directory link count checks in ocfs2_link()
        ocfs2: move nlink check in ocfs2_mknod()
        ocfs2: Fix heartbeat sector calculation
        [PATCH] fs/ocfs2/ioctl.c should #include "ioctl.h"
        ocfs2: add ext2 attributes
        configfs: Prevent duplicate subsystem names.
      3e59ddff
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 6bbd9b6d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (64 commits)
        [BLOCK] dm-crypt: trivial comment improvements
        [CRYPTO] api: Deprecate crypto_digest_* and crypto_alg_available
        [CRYPTO] padlock: Convert padlock-sha to use crypto_hash
        [CRYPTO] users: Use crypto_comp and crypto_has_*
        [CRYPTO] api: Add crypto_comp and crypto_has_*
        [CRYPTO] users: Use crypto_hash interface instead of crypto_digest
        [SCSI] iscsi: Use crypto_hash interface instead of crypto_digest
        [CRYPTO] digest: Remove old HMAC implementation
        [CRYPTO] doc: Update documentation for hash and me
        [SCTP]: Use HMAC template and hash interface
        [IPSEC]: Use HMAC template and hash interface
        [CRYPTO] tcrypt: Use HMAC template and hash interface
        [CRYPTO] hmac: Add crypto template implementation
        [CRYPTO] digest: Added user API for new hash type
        [CRYPTO] api: Mark parts of cipher interface as deprecated
        [PATCH] scatterlist: Add const to sg_set_buf/sg_init_one pointer argument
        [CRYPTO] drivers: Remove obsolete block cipher operations
        [CRYPTO] users: Use block ciphers where applicable
        [SUNRPC] GSS: Use block ciphers where applicable
        [IPSEC] ESP: Use block ciphers where applicable
        ...
      6bbd9b6d
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · a489d159
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
        [S390] hypfs crashes with invalid mount option.
        [S390] cio: subchannel evaluation function operates without lock
        [S390] cio: always query all paths on path verification.
        [S390] cio: update path groups on logical CHPID changes.
        [S390] cio: subchannels in no-path state.
        [S390] Replace nopav-message on VM.
        [S390] set modalias for ccw bus uevents.
        [S390] Get rid of DBG macro.
        [S390] Use alternative user-copy operations for new hardware.
        [S390] Make user-copy operations run-time configurable.
        [S390] Cleanup in signal handling code.
        [S390] Cleanup in page table related code.
        [S390] Linux API for writing z/VM APPLDATA Monitor records.
        [S390] xpram off by one error.
        [S390] Remove kexec experimental flag.
        [S390] cleanup appldata.
        [S390] fix typo in vmcp.
        [S390] Kernel stack overflow handling.
        [S390] qdio slsb processing state.
        [S390] Missing initialization in common i/o layer.
        ...
      a489d159
    • L
      Merge git://git.infradead.org/mtd-2.6 · a48178a2
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6:
        Remove accidentally-added include/linux/utsrelease.h
        Revert "[MTD] blkdev helper code: fix printk format warning"
        [MTD] Add SSFDC (SmartMedia) read-only translation layer
        [MTD] pmc551 pci cleanup
        [MTD] pmc551 use kzalloc
        [MTD] pmc551 whitespace cleanup
        [MTD] Remove iq80310 map driver
        [MTD NAND] Fix in typo ndfc.c causing wrong ECC layout
        [MTD] physmap: add power management support
        ioremap balanced with iounmap for drivers/mtd subsystem
        [MTD] Switch to pci_get_device and do ref counting
        [MTD] blkdev helper code: fix printk format warning
        [MTD] Fix ixp4xx partition parsing.
        [JFFS2] Remove unneeded ifdefs from jffs2_fs_i.h
        [MTD NAND] Remove old code in au1550nd.c
        [MTD] Unlock NOR flash automatically where necessary
      a48178a2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 14d1adfc
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)
        [POWERPC] Fix ohare IDE irq workaround on old powermacs
        [POWERPC] EEH: Power4 systems sometimes need multiple resets.
        [POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.
        [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c
        [POWERPC] Maple U3 HT - reject inappropriate config space access
        [POWERPC] Fix IPIC pending register assignments
        [POWERPC] powerpc: fix building gdb against asm/ptrace.h
        [POWERPC] Remove DISCONTIGMEM cruft from page.h
        [POWERPC] Merge iSeries i/o operations with the rest
        [POWERPC] 40x: Fix debug status register defines
        [POWERPC] Fix compile error in sbc8560
        [POWERPC] EEH: support MMIO enable recovery step
        [POWERPC] EEH: enable MMIO/DMA on frozen slot
        [POWERPC] EEH: code comment cleanup
        [POWERPC] EEH: balance pcidev_get/put calls
        [POWERPC] PPC: Fix xmon stack frame address in backtrace
        [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX
        [POWERPC] Start arch/powerpc/boot code reorganization
        [POWERPC] Define of_read_ulong helper
        [POWERPC] iseries: eliminate a couple of warnings
        ...
      14d1adfc
    • D
      734a5628
  2. 22 9月, 2006 24 次提交
  3. 21 9月, 2006 5 次提交