Merge branch 'linus'

diff --cc fs/Kconfig
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc net/sunrpc/sched.c
index 3fc13be,dff0779..b9969b9
--- 1/net/sunrpc/sched.c
--- 2/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@@ -62,9 -63,9 +63,9 @@@ static LIST_HEAD(all_tasks)
  /*
   * rpciod-related stuff
   */
- static DECLARE_MUTEX(rpciod_sema);
+ static DEFINE_MUTEX(rpciod_mutex);
  static unsigned int           rpciod_users;
 -static struct workqueue_struct *rpciod_workqueue;
 +struct workqueue_struct *rpciod_workqueue;
  
  /*
   * Spinlock for other critical sections of code.