Messages in this thread | | | Date | Fri, 11 Jul 2014 12:38:04 +0100 | From | Lee Jones <> | Subject | Re: [STLinux Kernel] [PATCH v3 0/5] phy: miphy365x: Introduce support for MiPHY365x |
| |
On Fri, 11 Jul 2014, Maxime Coquelin wrote: > 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.
I'll rebase onto -rc3 now and submit the patch as a vX+1.
-- 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/
| |