summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-15 21:16:35 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-15 21:16:35 +0300
commit97d6e2b636c6e07b99965f3db9f20950d7de2ecc (patch)
treee52753719a96858cc6f1ca4310258e5d4058576e /arch/s390
parent7558009751a591c3be148b2569b37efb951828d8 (diff)
parent0fd972a7d91d6e15393c449492a04d94c0b89351 (diff)
downloadlinux-97d6e2b636c6e07b99965f3db9f20950d7de2ecc.tar.xz
Merge tag 'module-final-v4.2-rc1' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions