Messages in this thread | | | Subject | Re: linux-next: manual merge of the phy-next tree with the qcom tree | From | Marc Gonzalez <> | Date | Tue, 23 Apr 2019 11:13:59 +0200 |
| |
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. We can deal with this later as it is trivial. >> The best way probably would have been for Kishon to take this patch as well. >> Then he would have fixed it up and no one else would have seen it. But we'll >> deal with it in a few weeks. No biggie. > > 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.
Regards.
| |