1. 26 Jun, 2006 33 commits
  2. 25 Jun, 2006 7 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
      61b91758
    • 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>
      f36f44de
    • 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>
      a5d157e0
    • 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()
        nfs-build-fix-99
        git-nfs-build-fixes
        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
        ...
      1d77062b
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 25581ad1
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
        V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
        V4L/DVB (4210a): git-dvb versus matroxfb
        V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
        Fixes some sync issues between V4L/DVB development and GIT
        V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
        V4L/DVB (4205): Merge tda9887 module into tuner.
        V4L/DVB (4203): Explicitly set the enum values.
        V4L/DVB (4202): allow selecting CX2341x port mode
        V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
        V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
        V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
        V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
        V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
        V4L/DVB (4193): Update cx2341x fw encoding API doc.
        V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
        V4L/DVB (4191): Add CX2341X MPEG encoder module.
        V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
        V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
        V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
        V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
        ...
      25581ad1
    • Linus Torvalds's avatar
      Fix PM_TRACE dependency: works only on 32-bit x86 for now · 72cf2709
      Linus Torvalds authored
      
      
      Not that x86-64 and other architecture support should be difficult to
      add (trivial fixups to the data format and add the proper linker script
      entry).
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      72cf2709
    • Sonny Rao's avatar
      [PATCH] fix race in idr code · 1eec0056
      Sonny Rao authored
      I ran into a bug where the kernel died in the idr code:
      
      cpu 0x1d: Vector: 300 (Data Access) at [c000000b7096f710]
          pc: c0000000001f8984: .idr_get_new_above_int+0x140/0x330
          lr: c0000000001f89b4: .idr_get_new_above_int+0x170/0x330
          sp: c000000b7096f990
         msr: 800000000000b032
         dar: 0
       dsisr: 40010000
        current = 0xc000000b70d43830
        paca    = 0xc000000000556900
          pid   = 2022, comm = hwup
      1d:mon> t
      [c000000b7096f990] c0000000000d2ad8 .expand_files+0x2e8/0x364 (unreliable)
      [c000000b7096faa0] c0000000001f8bf8 .idr_get_new_above+0x18/0x68
      [c000000b7096fb20] c00000000002a054 .init_new_context+0x5c/0xf0
      [c000000b7096fbc0] c000000000049dc8 .copy_process+0x91c/0x1404
      [c000000b7096fcd0] c00000000004a988 .do_fork+0xd8/0x224
      [c000000b7096fdc0] c00000000000ebdc .sys_clone+0x5c/0x74
      [c000000b7096fe30] c000000000008950 .ppc_clone+0x8/0xc
      1eec0056