lkml.org 
[lkml]   [2012]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the net-next tree with the sparc-next tree
    On Wed, May 16, 2012 at 02:39:44PM +1000, Stephen Rothwell wrote:
    > Hi all,
    >
    > Today's linux-next merge of the net-next tree got a conflict in
    > arch/sparc/Makefile between commit e1d7de8377e6 ("sparc: introduce
    > arch/sparc/Kbuild") from the sparc-next tree and commit 2809a2087cc4
    > ("net: filter: Just In Time compiler for sparc") from the net-next tree.
    >
    > I suspect that the core-y net bit below should be changed to be a obj-y
    > bit of arch/sparc/Kbuild ...

    Correct - like this:

    arch/sparc/Kbuild:

    obj-y += net/

    Sam


    \
     
     \ /
      Last update: 2012-05-16 08:42    [W:0.023 / U:31.252 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site