All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
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>
Subject: Re: linux-next: manual merge of the phy-next tree with the qcom tree
Date: Mon, 22 Apr 2019 17:17:40 +0530	[thread overview]
Message-ID: <4e8aefdf-d0bb-9dcd-63b1-94de9d4e69d4@ti.com> (raw)
In-Reply-To: <20190419045844.GA3322@hector.attlocal.net>



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

  reply	other threads:[~2019-04-22 11:47 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-18  5:29 linux-next: manual merge of the phy-next tree with the qcom tree Stephen Rothwell
2019-04-18  7:35 ` Marc Gonzalez
2019-04-18  7:59   ` Stephen Rothwell
2019-04-19  4:58   ` Andy Gross
2019-04-22 11:47     ` Kishon Vijay Abraham I [this message]
2019-04-23  9:13       ` Marc Gonzalez
2019-04-23 19:15         ` Andy Gross
  -- strict thread matches above, loose matches on Subject: below --
2022-01-28  1:26 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4e8aefdf-d0bb-9dcd-63b1-94de9d4e69d4@ti.com \
    --to=kishon@ti.com \
    --cc=agross@kernel.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=jhugo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=marc.w.gonzalez@free.fr \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.