Merge

diff --cc fs/inode.c
index 503e500b65846eff05bc81949668e129e8f1d0e5,8389f550e30cafeae58d2f057667cddcde15d8af..25c7eb8583778fe3cbe3d8b677c6411d74464702
--- 1/fs/inode.c
--- 2/fs/inode.c
+++ b/fs/inode.c
@@@ -12,7 -12,7 +12,8 @@@
  #include <linux/quotaops.h>
  #include <linux/slab.h>
  #include <linux/writeback.h>
+ #include <linux/module.h>
 +#include <linux/backing-dev.h>
  
  /*
   * New inode.c implementation.

diff --cc fs/reiserfs/inode.c
Simple merge

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

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

diff --cc kernel/ksyms.c
Simple merge