Merge branch 'linus'

diff --cc fs/Kconfig
Simple merge

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

diff --cc net/sunrpc/sched.c
index 3fc13bea302d49648ebd7f58329f48dcc03747e6,dff07795bd16af0dbbb5ff1cb51e4729a28ef3ab..b9969b91a9f73a5f149b6e5403c358a0207b0662
--- 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.