1. 01 Sep, 2007 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 6db602d4
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/ehca: SRQ fixes to enable IPoIB CM
        IB/ehca: Fix Small QP regressions
      6db602d4
    • Trond Myklebust's avatar
      NFS: Fix the mount regression · e89a5a43
      Trond Myklebust authored
      This avoids the recent NFS mount regression (returning EBUSY when
      mounting the same filesystem twice with different parameters).
      
      The best I can do given the constraints appears to be to have the kernel
      first look for a superblock that matches both the fsid and the
      user-specified mount options, and then spawn off a new superblock if
      that search fails.
      
      Note that this is not the same as specifying nosharecache everywhere
      since nosharecache will never attempt to match an existing superblock.
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Tested-by: default avatarHua Zhong <hzhong@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e89a5a43
    • Linus Torvalds's avatar
      x86: be even more careful about checking the stack frame on dumping · 36ad4885
      Linus Torvalds authored
      lguest didn't initialize the kernel stack the way a real i386 kernel
      does, and ended up triggering a corner-case in the stack frame checking
      that doesn't happen on naive i386, and that the stack dumping didn't
      handle quite right.
      
      This makes the frame handling more correct, and tries to clarify the
      code at the same time so that it's a bit more obvious what is going on.
      
      Thanks to Rusty Russell for debugging the lguest failure-
      
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      36ad4885
    • Linus Torvalds's avatar
      Do not use the ia64 clocksource on non-ia64 architectures · 3b2b64fd
      Linus Torvalds authored
      The HPET clocksource in drivers/char/hpet.c was written as generic code
      for ia64, but it is not yet ready to replace the native HPET clocksource
      implementations that the i386/x86-64 architectures use.
      
      On x86[-64], trying to register this clocksource results in potentially
      multiple hpet-based clocksources being registered, and if the ia64 one
      is chosen on x86_64 some users have experienced hangs.
      
      Eventually all three architectures may end up using the same code, but
      that is not the case right now.
      
      Cc: John Stultz <johnstul@us.ibm.com>
      Cc: Tony Luck <tony.luck@intel.com>
      Cc: Paolo Ornati <ornati@fastwebnet.it>
      Cc: Bob Picco <bob.picco@hp.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3b2b64fd
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 618a821d
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        - cxgb3 engine microcode load
        cxgb3 - Fix dev->priv usage
        qeth: Drop ARP packages on HiperSockets interface with NOARP attribute.
        qeth: provide specific message for OSA-adapters exclusively used
        qeth: crash during reboot after failing online setting
        qeth: Announce tx checksumming for qeth devices in TSO/EDDP mode
        qeth: dont return the return values of void functions.
        qeth: enforce a rate limit for inbound scatter gather messages
        qeth: ungrouping a device must not be interruptible
        netxen: fix crashes during module unload
        netxen: Avoid firmware load in PCI probe
        PS3: fix the bug that 'ifconfig down' would hang
        IOC3: Program UART predividers.
      618a821d
  2. 31 Aug, 2007 35 commits