lkml.org 
[lkml]   [2012]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the irqdomain tree with the arm tree
    Hi Grant,

    Today's linux-next merge of the irqdomain tree got a conflict in
    arch/arm/Kconfig between commit 4755ccad6d53 ("ARM: 7259/3: net: JIT
    compiler for packet filters") from the arm tree and commit 2378b56c3747
    ("ARM: kconfig: always select IRQ_DOMAIN") from the irqdomain 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/arm/Kconfig
    index 3795400,c857283..0000000
    --- a/arch/arm/Kconfig
    +++ b/arch/arm/Kconfig
    @@@ -33,7 -31,8 +33,8 @@@ config AR
    select GENERIC_IRQ_SHOW
    select CPU_PM if (SUSPEND || CPU_IDLE)
    select GENERIC_PCI_IOMAP
    + select HAVE_BPF_JIT
    + select IRQ_DOMAIN
    help
    The ARM series is a line of low-power-consumption RISC chip designs
    licensed by ARM Ltd and targeted at embedded applications and
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-03-19 07:25    [W:0.022 / U:0.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site