lkml.org 
[lkml]   [2012]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Subject[PULL] Last-minute module patches
    Date
    The following changes since commit 42a579a0f960081cd16fc945036e4780c3ad3202:

    Merge branches 'timers-urgent-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2012-08-05 22:28:49 +0300)

    are available in the git repository at:


    git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus.git tags/module-for-linus

    for you to fetch changes up to 26ab1397b6e51ffc72fb00ad012598eb2e135726:

    Make most arch asm/module.h files use asm-generic/module.h (2012-08-06 16:57:33 +0930)

    ----------------------------------------------------------------
    Left to (past?) the last minute for two reasons:
    1) There were minor conflicts in linux-next; I like a clean merge, so wanted
    the other stuff (aka real work) in first.
    2) I was hoping we could discard the lve license check, but Greg tells me
    it's still not 100% resolved, so I've left it in.

    Thanks!
    Rusty.

    ----------------------------------------------------------------
    David Howells (1):
    Make most arch asm/module.h files use asm-generic/module.h

    Matthew Garrett (1):
    module: taint kernel when lve module is loaded

    arch/Kconfig | 19 +++++++++++++++++
    arch/alpha/Kconfig | 2 ++
    arch/alpha/include/asm/module.h | 10 ++-------
    arch/arm/Kconfig | 2 ++
    arch/arm/include/asm/module.h | 8 ++------
    arch/avr32/Kconfig | 2 ++
    arch/avr32/include/asm/module.h | 6 ++----
    arch/blackfin/Kconfig | 2 ++
    arch/blackfin/include/asm/module.h | 4 +---
    arch/c6x/Kconfig | 1 +
    arch/c6x/include/asm/module.h | 12 +----------
    arch/cris/Kconfig | 1 +
    arch/cris/include/asm/Kbuild | 2 ++
    arch/cris/include/asm/module.h | 9 --------
    arch/frv/include/asm/module.h | 8 +-------
    arch/h8300/Kconfig | 1 +
    arch/h8300/include/asm/Kbuild | 2 ++
    arch/h8300/include/asm/module.h | 11 ----------
    arch/hexagon/Kconfig | 1 +
    arch/ia64/Kconfig | 2 ++
    arch/ia64/include/asm/module.h | 6 ++----
    arch/m32r/Kconfig | 1 +
    arch/m32r/include/asm/Kbuild | 2 ++
    arch/m32r/include/asm/module.h | 10 ---------
    arch/m32r/kernel/module.c | 15 --------------
    arch/m68k/Kconfig | 3 +++
    arch/m68k/include/asm/module.h | 6 ++----
    arch/microblaze/Kconfig | 1 +
    arch/mips/Kconfig | 3 +++
    arch/mips/include/asm/module.h | 10 +++++++--
    arch/mips/kernel/module.c | 2 ++
    arch/mn10300/Kconfig | 1 +
    arch/mn10300/include/asm/module.h | 7 +------
    arch/openrisc/Kconfig | 1 +
    arch/parisc/Kconfig | 2 ++
    arch/parisc/include/asm/module.h | 16 +++------------
    arch/powerpc/Kconfig | 2 ++
    arch/powerpc/include/asm/module.h | 7 +------
    arch/s390/Kconfig | 2 ++
    arch/s390/include/asm/module.h | 18 +++-------------
    arch/score/Kconfig | 2 ++
    arch/score/include/asm/module.h | 6 +-----
    arch/score/kernel/module.c | 10 ---------
    arch/sh/Kconfig | 2 ++
    arch/sh/include/asm/module.h | 14 +++----------
    arch/sparc/Kconfig | 1 +
    arch/sparc/include/asm/Kbuild | 1 +
    arch/sparc/include/asm/module.h | 24 ----------------------
    arch/tile/Kconfig | 1 +
    arch/unicore32/Kconfig | 1 +
    arch/x86/Kconfig | 2 ++
    arch/xtensa/Kconfig | 1 +
    arch/xtensa/include/asm/module.h | 9 +-------
    include/asm-generic/module.h | 40 +++++++++++++++++++++++++++++-------
    include/linux/moduleloader.h | 36 ++++++++++++++++++++++++++++----
    kernel/module.c | 24 ++++------------------
    56 files changed, 171 insertions(+), 223 deletions(-)
    delete mode 100644 arch/cris/include/asm/module.h
    delete mode 100644 arch/h8300/include/asm/module.h
    delete mode 100644 arch/m32r/include/asm/module.h
    delete mode 100644 arch/sparc/include/asm/module.h


    \
     
     \ /
      Last update: 2012-08-06 10:21    [W:0.026 / U:0.932 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site