lkml.org 
[lkml]   [2014]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [STLinux Kernel] [PATCH v3 0/5] phy: miphy365x: Introduce support for MiPHY365x
    On Fri, 11 Jul 2014, Peter Griffin wrote:
    > On Fri, 11 Jul 2014, Lee Jones wrote:
    > > > One small point, patch 5 which adds the DT nodes may not apply as the file got
    > > > renamed from stih416-b2020-revE.dts to stih416-b2020e.dts.
    > >
    > > Not required, Git should handle this seamlessly.
    >
    > I didn't ask you to do anything.

    Ah, I misread, my bad.

    > Also when I made the same mistake, GIT
    > did not handle it seamlessly and I got the following query
    > from Ulf http://www.mail-archive.com/devicetree@vger.kernel.org/msg33926.html

    Oh, it looks like the renaming patch went into -rc3 as part of Max's
    -fixes branch. I assumed it would go in via -next. This is
    different, so yes, it will have to be rebased onto -rc3.

    Maxime,
    Do you want me to do that, or are you happy to?

    > So in case Kishon has the same problem I thought I'd do a pre-emptive strike!

    Yes, good call.

    --
    Lee Jones
    Linaro STMicroelectronics Landing Team Lead
    Linaro.org │ Open source software for ARM SoCs
    Follow Linaro: Facebook | Twitter | Blog
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-07-11 14:01    [W:4.171 / U:0.624 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site