1. 26 Jun, 2006 36 commits
  2. 25 Jun, 2006 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 61b91758
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/iser: iSER Kconfig and Makefile
        IB/iser: iSER handling of memory for RDMA
        IB/iser: iSER RDMA CM (CMA) and IB verbs interaction
        IB/iser: iSER initiator iSCSI PDU and TX/RX
        IB/iser: iSCSI iSER transport provider high level code
        IB/iser: iSCSI iSER transport provider header file
        IB/uverbs: Remove unnecessary list_del()s
        IB/uverbs: Don't free wr list when it's known to be empty
    • Linus Torvalds's avatar
      Fix NFS2 compile error · f36f44de
      Linus Torvalds authored
      Trond had apparently merged the same patch twice, causing a duplicate
      include of the "internal.h" file, with resulting obvious confusion.
      Tssk.  I'm the only one allowed to send out trees that don't even
      compile! Who does this Trond guy think he is?
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    • Björn Steinbrink's avatar
      [PATCH] i386: Fix softirq accounting with 4K stacks · a5d157e0
      Björn Steinbrink authored
      Copy the softirq bits in preempt_count from the current context into the
      hardirq context when using 4K stacks to make the softirq_count macro work
      correctly and thereby fix softirq cpu time accounting.
      Signed-off-by: default avatarBjörn Steinbrink <B.Steinbrink@gmx.de>
      Acked-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    • Linus Torvalds's avatar
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · 1d77062b
      Linus Torvalds authored
      * git://git.linux-nfs.org/pub/linux/nfs-2.6: (51 commits)
        nfs: remove nfs_put_link()
        Merge branch 'odirect'
        NFS: alloc nfs_read/write_data as direct I/O is scheduled
        NFS: Eliminate nfs_get_user_pages()
        NFS: refactor nfs_direct_free_user_pages
        NFS: remove user_addr, user_count, and pos from nfs_direct_req
        NFS: "open code" the NFS direct write rescheduler
        NFS: Separate functions for counting outstanding NFS direct I/Os
        NLM: Fix reclaim races
        NLM: sem to mutex conversion
        locks.c: add the fl_owner to nlm_compare_locks
        NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts
        NFS: Split fs/nfs/inode.c
        NFS: Fix typo in nfs_do_clone_mount()
        NFS: Fix compile errors introduced by referrals patches
        NFSv4: Ensure that referral mounts bind to a reserved port
        NFSv4: A root pathname is sent as a zero component4
        NFSv4: Follow a referral