lkml.org 
[lkml]   [2012]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: linux-next: manual merge of the arm-soc tree with the pm tree
    From
    Hi,

    On Mon, Sep 24, 2012 at 2:21 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    > Hi all,
    >
    > Today's linux-next merge of the arm-soc tree got a conflict in
    > arch/arm/mach-shmobile/include/mach/common.h between commit 35f2b0bd5911
    > ("ARM: shmobile: Move definition of shmobile_init_late() to header") from
    > the pm tree and commit a62580e58065 ("ARM: SoC: convert shmobile SMP to
    > SMP operations") from the arm-soc tree.
    >
    > I fixed it up (see below) and can carry the fix as necessary (no action
    > is required).

    Hmm.

    Rafael, the shmobile SoC-specific code in your tree looks like it
    should have been merged through arm-soc? That way we could have
    resolved the conflicts locally without having it spill out into other
    trees (and thus seen by both sfr and Linus when the branches goes up
    to him).


    -Olof


    \
     
     \ /
      Last update: 2012-09-24 19:41    [W:3.716 / U:1.880 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site