[lkml]   [2012]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the mfd tree with Linus' tree
    Hi Stephen,

    On Fri, Mar 23, 2012 at 02:32:37PM +1100, Stephen Rothwell wrote:
    > Hi Samuel,
    > Today's linux-next merge of the mfd tree got a conflict in
    > drivers/mfd/twl-core.c between commits 5769089ac725 ("mfd: twl-core.c:
    > Fix the number of interrupts managed by twl4030"), 75294957be1d
    > ("irq_domain: Remove 'new' irq_domain in favour of the ppc one") and
    > 964dba283439 ("devicetree: Add empty of_platform_populate() for !
    > CONFIG_OF_ADDRESS (sparc)") from Linus' tree and commits 9e1786202704
    > ("mfd: Make twl-core not depend on pdata->irq_base/end") and 78518ffa08fc
    > ("mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files") from
    > the mfd tree.
    > I *think* that the right thing to do is to use the version from the mfd
    > tree ...
    That's correct.
    I have a for-next-merge branch where I usually have the merge conflicts with
    Linus tree fixed, in case you're interested.

    > I do wonder why I only got this now (in the merge window) ...
    I got a pull request from Benoit a couple days before the merge window opened.
    Then I realized part of the pull request contained a merge of one of Grant's
    branch. So I wanted to wait for Grant's code to get in before picking the mfd
    work on top of it. I didn't want to send a pull request to Linus with a merge
    point for something that would have been already merged. Maybe I was wrong,
    you tell me.


    Intel Open Source Technology Centre

     \ /
      Last update: 2012-03-23 10:35    [W:0.029 / U:2.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site