lkml.org 
[lkml]   [2012]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the rr tree with Linus' tree
    Hi Rusty,

    Today's linux-next merge of the rr tree got a conflict in
    arch/alpha/Kconfig between commit f2db633d301b ("alpha: Use new generic
    strncpy_from_user() and strnlen_user()") from Linus' tree and commit
    d673c23ca730 ("Make most arch asm/module.h files use
    asm-generic/module.h") from the rr tree.

    Just context changes. I fixed it up (see below) and can carry the fix as
    necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc arch/alpha/Kconfig
    index 9944ded,e73a1a7..0000000
    --- a/arch/alpha/Kconfig
    +++ b/arch/alpha/Kconfig
    @@@ -18,8 -18,8 +18,10 @@@ config ALPH
    select ARCH_HAVE_NMI_SAFE_CMPXCHG
    select GENERIC_SMP_IDLE_THREAD
    select GENERIC_CMOS_UPDATE
    + select GENERIC_STRNCPY_FROM_USER
    + select GENERIC_STRNLEN_USER
    + select HAVE_MOD_ARCH_SPECIFIC
    + select MODULES_USE_ELF_RELA
    help
    The Alpha is a 64-bit general-purpose processor designed and
    marketed by the Digital Equipment Corporation of blessed memory,
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-08-21 05:01    [W:0.026 / U:0.480 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site