Messages in this thread | | | Date | Fri, 11 Jul 2014 13:33:23 +0200 | From | Maxime Coquelin <> | Subject | Re: [STLinux Kernel] [PATCH v3 0/5] phy: miphy365x: Introduce support for MiPHY365x |
| |
On 07/11/2014 01:30 PM, Lee Jones wrote: > 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?
Actually, I already rebase the next branch for DT stuff on top of -rc3. This is not available on stlinux git yet because of mirroring issue. I will let you know when this is fixed, then you can rebase your DT patches on top of it.
Regards, Maxime
> >> So in case Kishon has the same problem I thought I'd do a pre-emptive strike! > > Yes, good call. >
| |