1. 08 Jul, 2006 5 commits
  2. 07 Jul, 2006 1 commit
  3. 06 Jul, 2006 28 commits
  4. 05 Jul, 2006 6 commits
    • Linus Torvalds's avatar
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · a942b57b
      Linus Torvalds authored
      * git://git.linux-nfs.org/pub/linux/nfs-2.6:
        NLM,NFSv4: Wait on local locks before we put RPC calls on the wire
        VFS: Add support for the FL_ACCESS flag to flock_lock_file()
        NFSv4: Ensure nfs4_lock_expired() caches delegated locks
        NLM,NFSv4: Don't put UNLOCK requests on the wire unless we hold a lock
        VFS: Allow caller to determine if BSD or posix locks were actually freed
        NFS: Optimise away an excessive GETATTR call when a file is symlinked
        This fixes a panic doing the first READDIR or READDIRPLUS call when:
        NFS: Fix NFS page_state usage
        Revert "Merge branch 'odirect'"
      a942b57b
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 887e5d5f
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3711/1: AT91 timer update
        [ARM] 3709/1: pnx4008: convert to generic irq subsystem
        [ARM] 3710/1: AT91 Serial: Use GPIO API
      887e5d5f
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · e8f75588
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (39 commits)
        [PATCH] myri10ge - Export more parameters to ethtool
        [PATCH] myri10ge - Use dev_info() when printing parameters after probe
        [PATCH] myri10ge - Drop ununsed nvidia chipset id
        [PATCH] myri10ge - Drop unused pm_state
        [PATCH] Fix freeing of net device
        [PATCH] remove dead entry in net wan Kconfig
        [PATCH] NI5010 netcard cleanup
        [PATCH] lock validator: fix ns83820.c irq-flags bug
        [PATCH] pcnet32: Cleanup rx buffers after loopback test.
        [PATCH] pcnet32: Suspend the chip rather than restart when changing multicast/promisc
        [PATCH] pcnet32: Handle memory allocation failures cleanly when resizing tx/rx rings
        [PATCH] pcnet32: Use kcalloc instead of kmalloc and memset
        [PATCH] pcnet32: Fix off-by-one in get_ringparam
        [PATCH] pcnet32: Use PCI_DEVICE macro
        [PATCH] pcnet32: Fix Section mismatch error
        [PATCH] Add support for the Cicada 8201 PHY
        [PATCH] zd1211rw: disable TX queue during stop
        [PATCH] ZyDAS ZD1211 USB-WLAN driver
        [PATCH] softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549
        [PATCH] CONFIG_WIRELESS_EXT is neccessary after all
        ...
      e8f75588
    • Brice Goglin's avatar
      [PATCH] myri10ge - Export more parameters to ethtool · 2c1a1088
      Brice Goglin authored
      Add the IRQ line, the tx_boundary, and whether Write-combining and MSI
      are enabled to the list of parameters that are exported to ethtool.
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      2c1a1088
    • Brice Goglin's avatar
      [PATCH] myri10ge - Use dev_info() when printing parameters after probe · d6020787
      Brice Goglin authored
      Displaying the interface name when listing the device parameters
      at the end of myri10ge_probe is not a good idea since udev might
      rename the interface soon afterwards.
      Print the bus id instead, using dev_info().
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      d6020787
    • brice@myri.com's avatar
      [PATCH] myri10ge - Drop ununsed nvidia chipset id · 18ac5443
      brice@myri.com authored
      The workaround for the AER capability of the nVidia chipset has been
      removed, we don't need this PCI id anymore. Drop it.
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      18ac5443