Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...
Linus Torvalds [Sat, 24 Mar 2012 17:24:31 +0000 (10:24 -0700)]
Pull cleanup of fs/ and lib/ users of module.h from Paul Gortmaker:
 "Fix up files in fs/ and lib/ dirs to only use module.h if they really
  need it.

  These are trivial in scope vs the work done previously.  We now have
  things where any few remaining cleanups can be farmed out to arch or
  subsystem maintainers, and I have done so when possible.  What is
  remaining here represents the bits that don't clearly lie within a
  single arch/subsystem boundary, like the fs dir and the lib dir.

  Some duplicate includes arising from overlapping fixes from
  independent subsystem maintainer submissions are also quashed."

Fix up trivial conflicts due to clashes with other include file cleanups
(including some due to the previous bug.h cleanup pull).

* tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  lib: reduce the use of module.h wherever possible
  fs: reduce the use of module.h wherever possible
  includecheck: delete any duplicate instances of module.h

23 files changed:
1  2 
fs/aio.c
fs/binfmt_flat.c
fs/compat_ioctl.c
fs/dcache.c
fs/fs-writeback.c
fs/fs_struct.c
fs/libfs.c
fs/namei.c
fs/select.c
fs/seq_file.c
fs/splice.c
fs/stat.c
fs/super.c
lib/bitmap.c
lib/idr.c
lib/iommu-helper.c
lib/kobject_uevent.c
lib/list_debug.c
lib/scatterlist.c
lib/string.c
lib/swiotlb.c
lib/timerqueue.c
lib/vsprintf.c

diff --cc fs/aio.c
Simple merge
Simple merge
Simple merge
diff --cc fs/dcache.c
Simple merge
Simple merge
diff --cc fs/fs_struct.c
Simple merge
diff --cc fs/libfs.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/select.c
Simple merge
diff --cc fs/seq_file.c
Simple merge
diff --cc fs/splice.c
Simple merge
diff --cc fs/stat.c
Simple merge
diff --cc fs/super.c
Simple merge
diff --cc lib/bitmap.c
Simple merge
diff --cc lib/idr.c
Simple merge
@@@ -2,9 -2,8 +2,9 @@@
   * IOMMU helper functions for the free area management
   */
  
- #include <linux/module.h>
+ #include <linux/export.h>
  #include <linux/bitmap.h>
 +#include <linux/bug.h>
  
  int iommu_is_span_boundary(unsigned int index, unsigned int nr,
                           unsigned long shift,
Simple merge
@@@ -6,9 -6,8 +6,9 @@@
   * DEBUG_LIST.
   */
  
- #include <linux/module.h>
+ #include <linux/export.h>
  #include <linux/list.h>
 +#include <linux/bug.h>
  #include <linux/kernel.h>
  
  /*
Simple merge
diff --cc lib/string.c
Simple merge
diff --cc lib/swiotlb.c
Simple merge
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  
 +#include <linux/bug.h>
  #include <linux/timerqueue.h>
  #include <linux/rbtree.h>
- #include <linux/module.h>
+ #include <linux/export.h>
  
  /**
   * timerqueue_add - Adds timer to timerqueue.
diff --cc lib/vsprintf.c
Simple merge