1. 15 12月, 2009 4 次提交
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · af853e63
      Linus Torvalds 提交于
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: fix lh7a40x build
        ARM: fix sa1100 build
        ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug
        ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions
        ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq
        [ARM] pxa/zeus: default configuration for Arcom Zeus SBC.
        [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus
        [ARM] pxa/zeus: basic support for Arcom Zeus SBC
        [ARM] pxa/em-x270: fix usb hub power up/reset sequence
        PCMCIA: fix pxa2xx_lubbock modular build error
        ARM: RealView: Fix typo in the RealView/PBX Kconfig entry
        ARM: Do not allow the probing of the local timer
        ARM: Add an earlyprintk debug console
      af853e63
    • L
      Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 3f86ce72
      Linus Torvalds 提交于
      * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (75 commits)
        NFS: Fix nfs_migrate_page()
        rpc: remove unneeded function parameter in gss_add_msg()
        nfs41: Invoke RECLAIM_COMPLETE on all new client ids
        SUNRPC: IS_ERR/PTR_ERR confusion
        NFSv41: Fix a potential state leakage when restarting nfs4_close_prepare
        nfs41: Handle NFSv4.1 session errors in the delegation recall code
        nfs41: Retry delegation return if it failed with session error
        nfs41: Handle session errors during delegation return
        nfs41: Mark stateids in need of reclaim if state manager gets stale clientid
        NFS: Fix up the declaration of nfs4_restart_rpc when NFSv4 not configured
        nfs41: Don't clear DRAINING flag on NFS4ERR_STALE_CLIENTID
        nfs41: nfs41_setup_state_renewal
        NFSv41: More cleanups
        NFSv41: Fix up some bugs in the NFS4CLNT_SESSION_DRAINING code
        NFSv41: Clean up slot table management
        NFSv41: Fix nfs4_proc_create_session
        nfs41: Invoke RECLAIM_COMPLETE
        nfs41: RECLAIM_COMPLETE functionality
        nfs41: RECLAIM_COMPLETE XDR functionality
        Cleanup some NFSv4 XDR decode comments
        ...
      3f86ce72
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · d0316554
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits)
        m68k: rename global variable vmalloc_end to m68k_vmalloc_end
        percpu: add missing per_cpu_ptr_to_phys() definition for UP
        percpu: Fix kdump failure if booted with percpu_alloc=page
        percpu: make misc percpu symbols unique
        percpu: make percpu symbols in ia64 unique
        percpu: make percpu symbols in powerpc unique
        percpu: make percpu symbols in x86 unique
        percpu: make percpu symbols in xen unique
        percpu: make percpu symbols in cpufreq unique
        percpu: make percpu symbols in oprofile unique
        percpu: make percpu symbols in tracer unique
        percpu: make percpu symbols under kernel/ and mm/ unique
        percpu: remove some sparse warnings
        percpu: make alloc_percpu() handle array types
        vmalloc: fix use of non-existent percpu variable in put_cpu_var()
        this_cpu: Use this_cpu_xx in trace_functions_graph.c
        this_cpu: Use this_cpu_xx for ftrace
        this_cpu: Use this_cpu_xx in nmi handling
        this_cpu: Use this_cpu operations in RCU
        this_cpu: Use this_cpu ops for VM statistics
        ...
      
      Fix up trivial (famous last words) global per-cpu naming conflicts in
      	arch/x86/kvm/svm.c
      	mm/slab.c
      d0316554
    • W
      Documentation: rw_lock lessons learned · fb0bbb92
      William Allen Simpson 提交于
      In recent months, two different network projects erroneously
      strayed down the rw_lock path.  Update the Documentation
      based upon comments by Eric Dumazet and Paul E. McKenney in
      those threads.
      
      Further updates await somebody else with more expertise.
      
      Changes:
        - Merged with extensive content by Stephen Hemminger.
        - Fix one of the comments by Linus Torvalds.
      
      Signed-off-by: William.Allen.Simpson@gmail.com
      Acked-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fb0bbb92
  2. 14 12月, 2009 8 次提交
  3. 13 12月, 2009 15 次提交
  4. 12 12月, 2009 13 次提交