From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Jul 2015 18:16:35 +0000 (-0700)
Subject: Merge tag 'module-final-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.2-rc3~31
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=97d6e2b636c6e07b99965f3db9f20950d7de2ecc;p=cascardo%2Flinux.git

Merge tag 'module-final-v4.2-rc1' of git://git./linux/kernel/git/paulg/linux

Pull final init.h/module.h code relocation from Paul Gortmaker:
 "With the release of 4.2-rc2 done, we should not be seeing any new code
  added that gets upset by this small code move, and we've banked yet
  another complete week of testing with this move in place on top of
  4.2-rc1 via linux-next to ensure that remained true.

  Given that, I'd like to put it in now so that people formulating new
  work for 4.3-rc1 will be exposed to the ever so slightly stricter (but
  sensible) requirements wrt.  whether they are needing init.h vs.
  module.h macros, even if they are not using linux-next.

  The diffstat of the move is slightly asymmetrical due to needing to
  leave behind a couple #ifdef in the old location and add the same ones
  to the new location, but other than that, it is a 1:1 move, complete
  with the module_init/exit trailing semicolon that we can't fix.  That
  is, until/unless someone does a tree-wide sed fix of all the
  approximately 800 currently in tree users relying on it"

* tag 'module-final-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  module: relocate module_init from init.h to module.h
---

97d6e2b636c6e07b99965f3db9f20950d7de2ecc