On Tue, Apr 23, 2019 at 11:13:59AM +0200, Marc Gonzalez wrote:
> > I've included "dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy" in
> > linux-phy tree now.
>
> Thanks Kishon,
>
> Great news. That's one less patch to keep track of.
Thanks Kishon!
Andy
On 22/04/2019 13:47, Kishon Vijay Abraham I wrote:
> On 19/04/19 10:28 AM, Andy Gross wrote:
>
>> On Thu, Apr 18, 2019 at 09:35:44AM +0200, Marc Gonzalez wrote:
>>>
>>> It is not clear to me what I could/should have done differently to avoid
>>> the conflict?
>>
>> I dropped the patch for now. W
On 19/04/19 10:28 AM, Andy Gross wrote:
> On Thu, Apr 18, 2019 at 09:35:44AM +0200, Marc Gonzalez wrote:
>>
>> It is not clear to me what I could/should have done differently to avoid
>> the conflict?
>
> I dropped the patch for now. We can deal with this later as it is trivial.
> The best way
On Thu, Apr 18, 2019 at 09:35:44AM +0200, Marc Gonzalez wrote:
>
> It is not clear to me what I could/should have done differently to avoid
> the conflict?
I dropped the patch for now. We can deal with this later as it is trivial.
The best way probably would have been for Kishon to take this pat
Hi Marc,
On Thu, 18 Apr 2019 09:35:44 +0200 Marc Gonzalez
wrote:
>
> It is not clear to me what I could/should have done differently to avoid
> the conflict?
Nothing really, it will need to be fixed up when these trees are merged
into Linus' tree (or some other tree along the way). It is not a
On 18/04/2019 07:29, Stephen Rothwell wrote:
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
>
> between commit:
>
> 369b89366a3d ("dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy")
>
> from the qcom tr
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
between commit:
369b89366a3d ("dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy")
from the qcom tree and commit:
2815588ea64b ("dt-bindings: phy-qcom-
7 matches
Mail list logo