1
0
Fork 0
alistair23-linux/net/sunrpc
Linus Torvalds 75659ca0c1 Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc: (22 commits)
  Remove commented-out code copied from NFS
  NFS: Switch from intr mount option to TASK_KILLABLE
  Add wait_for_completion_killable
  Add wait_event_killable
  Add schedule_timeout_killable
  Use mutex_lock_killable in vfs_readdir
  Add mutex_lock_killable
  Use lock_page_killable
  Add lock_page_killable
  Add fatal_signal_pending
  Add TASK_WAKEKILL
  exit: Use task_is_*
  signal: Use task_is_*
  sched: Use task_contributes_to_load, TASK_ALL and TASK_NORMAL
  ptrace: Use task_is_*
  power: Use task_is_*
  wait: Use TASK_NORMAL
  proc/base.c: Use task_is_*
  proc/array.c: Use TASK_REPORT
  perfmon: Use task_is_*
  ...

Fixed up conflicts in NFS/sunrpc manually..
2008-02-01 11:45:47 +11:00
..
auth_gss SUNRPC: Fix use of copy_to_user() in gss_pipe_upcall() 2008-01-30 02:06:00 -05:00
xprtrdma SUNRPC: Clean up functions that free address_strings array 2008-01-30 02:06:08 -05:00
Makefile RPCRDMA: rpc rdma transport switch 2007-10-09 17:18:03 -04:00
auth.c Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc 2008-02-01 11:45:47 +11:00
auth_null.c SUNRPC: cleanup rpc credential cache garbage collection 2007-07-10 23:40:35 -04:00
auth_unix.c SUNRPC: Remove the tk_auth macro... 2007-07-10 23:40:37 -04:00
cache.c [NET]: Add some acquires/releases sparse annotations. 2008-01-28 15:00:31 -08:00
clnt.c Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc 2008-02-01 11:45:47 +11:00
rpc_pipe.c SUNRPC: Remove an unneeded implicit type cast when calling rpc_depopulate() 2008-01-30 02:05:43 -05:00
rpcb_clnt.c Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc 2008-02-01 11:45:47 +11:00
sched.c Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc 2008-02-01 11:45:47 +11:00
socklib.c SUNRPC: temp var should match return type of xdr_skb_read_actor 2008-01-30 02:05:43 -05:00
stats.c SUNRPC: Restrict sunrpc client exports 2008-01-30 02:05:28 -05:00
sunrpc_syms.c SUNRPC: Move exported declarations to the function declarations 2008-01-30 02:05:28 -05:00
svc.c x86: change NR_CPUS arrays in numa_64 2008-01-30 13:33:11 +01:00
svcauth.c Fix occurrences of "the the " 2007-05-09 08:57:56 +02:00
svcauth_unix.c knfsd: nfsd: set rq_client to ip-address-determined-domain 2007-07-17 10:23:07 -07:00
svcsock.c [NET] Cleanup: Use sock_owned_by_user() macro 2007-10-10 16:49:00 -07:00
sysctl.c SUNRPC: Restrict sunrpc client exports 2008-01-30 02:05:28 -05:00
timer.c SUNRPC: add EXPORT_SYMBOL_GPL for generic transport functions 2007-10-09 17:17:36 -04:00
xdr.c SUNRPC: Move exported declarations to the function declarations 2008-01-30 02:05:28 -05:00
xprt.c SUNRPC: Add support for per-client timeout values 2008-01-30 02:05:59 -05:00
xprtsock.c SUNRPC: Clean up functions that free address_strings array 2008-01-30 02:06:08 -05:00