All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vinod Koul <vkoul@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kishon Vijay Abraham I <kishon@kernel.org>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the phy tree
Date: Mon, 19 Feb 2024 11:43:49 +0530	[thread overview]
Message-ID: <ZdLxnXkxTQSW5pOV@matsya> (raw)
In-Reply-To: <20240219150629.7d45ae60@canb.auug.org.au>

On 19-02-24, 15:06, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 19 Feb 2024 14:44:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > Today's linux-next merge of the phy-next tree got a conflict in:
> > 
> >   drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> > 
> > between commit:
> > 
> >   d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data")
> > 
> > from the phy tree and commit:
> > 
> >   52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling")

Thanks, this lgtm

BR
-- 
~Vinod

  reply	other threads:[~2024-02-19  6:13 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-19  3:44 linux-next: manual merge of the phy-next tree with the phy tree Stephen Rothwell
2024-02-19  4:06 ` Stephen Rothwell
2024-02-19  6:13   ` Vinod Koul [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-01-05  3:59 Stephen Rothwell
2025-05-15  7:14 Stephen Rothwell
2025-05-20  8:07 ` Geert Uytterhoeven
2025-05-15  7:09 Stephen Rothwell
2025-05-15  9:11 ` Prabhakar Mahadev Lad
2025-05-15 10:38   ` Vinod Koul
2025-05-15 10:38 ` Vinod Koul
2024-10-23  3:15 Stephen Rothwell
2024-01-25  1:33 Stephen Rothwell
2024-01-25 11:41 ` Vinod Koul
2023-09-25  3:16 Stephen Rothwell
2023-09-25  3:24 ` Stephen Rothwell
2023-09-25  3:10 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=ZdLxnXkxTQSW5pOV@matsya \
    --to=vkoul@kernel.org \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=kishon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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.