1. 28 Oct, 2010 3 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 22cdbd1d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (108 commits)
        ehea: Fixing statistics
        bonding: Fix lockdep warning after bond_vlan_rx_register()
        tunnels: Fix tunnels change rcu protection
        caif-u5500: Build config for CAIF shared mem driver
        caif-u5500: CAIF shared memory mailbox interface
        caif-u5500: CAIF shared memory transport protocol
        caif-u5500: Adding shared memory include
        drivers/isdn: delete double assignment
        drivers/net/typhoon.c: delete double assignment
        drivers/net/sb1000.c: delete double assignment
        qlcnic: define valid vlan id range
        qlcnic: reduce rx ring size
        qlcnic: fix mac learning
        ehea: fix use after free
        inetpeer: __rcu annotations
        fib_rules: __rcu annotates ctarget
        tunnels: add __rcu annotations
        net: add __rcu annotations to protocol
        ipv4: add __rcu annotations to routes.c
        qlge: bugfix: Restoring the vlan setting.
        ...
      22cdbd1d
    • Linus Torvalds's avatar
      fasync: Fix placement of FASYNC flag comment · 55f335a8
      Linus Torvalds authored
      In commit f7347ce4 ("fasync: re-organize fasync entry insertion to
      allow it under a spinlock") Arnd took an earlier patch of mine that had
      the comment about the FASYNC flag above the wrong function.
      
      When the fasync_add_entry() function was split to introduce the new
      fasync_insert_entry() helper function, the code that actually cares
      about the FASYNC bit moved to that new helper.
      
      So just move the comment to the right point.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      55f335a8
    • Linus Torvalds's avatar
      Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · 7420a8c0
      Linus Torvalds authored
      * 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        locks: turn lock_flocks into a spinlock
        fasync: re-organize fasync entry insertion to allow it under a spinlock
        locks/nfsd: allocate file lock outside of spinlock
        lockd: fix nlmsvc_notify_blocked locking
        lockd: push lock_flocks down
      7420a8c0
  2. 27 Oct, 2010 37 commits