Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: linux-next: manual merge of the phy-next tree with the qcom tree
To:     Andy Gross <agross@kernel.org>,
        Marc Gonzalez <marc.w.gonzalez@free.fr>
CC:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next <linux-next@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Bjorn Andersson <bjorn.andersson@linaro.org>,
        Jeffrey Hugo <jhugo@codeaurora.org>
References: <20190418152954.255015e1@canb.auug.org.au>
 <d194fa50-8bff-544e-eb88-128810f525f9@free.fr>
 <20190419045844.GA3322@hector.attlocal.net>
From:   Kishon Vijay Abraham I <kishon@ti.com>
Message-ID: <4e8aefdf-d0bb-9dcd-63b1-94de9d4e69d4@ti.com>
Date:   Mon, 22 Apr 2019 17:17:40 +0530
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <20190419045844.GA3322@hector.attlocal.net>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


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