From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kishon Vijay Abraham I Subject: Re: [PATCH v2 1/6] phy: miphy365x: Use the generic phy type constants in dt-bindings/phy/phy.h Date: Wed, 1 Apr 2015 13:31:15 +0530 Message-ID: <551BA5CB.6030903@ti.com> References: <1427728632-10846-1-git-send-email-peter.griffin@linaro.org> <1427728632-10846-2-git-send-email-peter.griffin@linaro.org> <551A2D4D.1010601@ti.com> <20150331074027.GH9447@x1> <551ABD99.2000503@ti.com> <551AC37E.70503@st.com> <20150401071501.GS9447@x1> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20150401071501.GS9447@x1> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Lee Jones , Maxime Coquelin Cc: Peter Griffin , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, srinivas.kandagatla-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, patrice.chotard-qxv4g6HH51o@public.gmane.org, balbi-l0cyMroinI0@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org List-Id: devicetree@vger.kernel.org Hi, On Wednesday 01 April 2015 12:45 PM, Lee Jones wrote: > On Tue, 31 Mar 2015, Maxime Coquelin wrote: > >> Hi Kishon, >> On 03/31/2015 05:30 PM, Kishon Vijay Abraham I wrote: >>> Maxime, >>> >>> On Tuesday 31 March 2015 01:10 PM, Lee Jones wrote: >>>> On Tue, 31 Mar 2015, Kishon Vijay Abraham I wrote: >>>> >>>>> Hi Patrice, Maxime, >>>>> >>>>> On Monday 30 March 2015 08:47 PM, Peter Griffin wrote: >>>>>> Now there are generic phy type constants declared in phy.h, >>>>>> migrate over to >>>>>> using them rather than defining our own. This change has >>>>>> been done as one >>>>>> atomic commit to be bisectable. >>>>>> >>>>>> Note: The values of the defines are the same, so there is no >>>>>> ABI breakage >>>>>> with this patch. >>>>>> >>>>>> Signed-off-by: Peter Griffin >>>>>> Acked-by: Rob Herring >>>>>> Acked-by: Lee Jones >>>>> >>>>> Are you okay for this patch to go via PHY tree? It modifies >>>>> arch/arm/boot/dts >>>>> /stih416.dtsi. >>>> >>>> These files need to be changed simultaneously in order to prevent >>>> breakage during bisection and the like. I think the best bet moving >>>> forward is to pull this into its own branch, tag it and send Maxime a >>>> pull-request to the immutable branch. It's the best way to minimise >>>> merge conflicts during the v4.1 merge window. >>> >>> okay. I still need an Ack from Maxime. >> >> You have my Ack. >> >> I haven't sent a pull request for STi DT files for v4.1 now, and it >> is too late to send one. >> So creating an immutable tag is not even needed in my opinion, you >> can just take the DT patch. > > Kishon, > > I saw that you took the MAINTAINERS patch, but not this one. If it's > because you are still unsure about it, I agree with Maxime, you can > just take this patch without fear of conflict. I've took this already https://git.kernel.org/cgit/linux/kernel/git/kishon/linux-phy.git/commit/?h=next&id=76fa6deabab05688a1653c2f66224be4a3c08d6a -Kishon -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html