linux-kernel - Re: linux-next: manual merge of the phy-next tree with the phy tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Mon, 19 Feb 2024 11:43:49 +0530
From: Vinod Koul <vkoul@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Kishon Vijay Abraham I <kishon@...nel.org>,
	Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the phy tree

On 19-02-24, 15:06, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 19 Feb 2024 14:44:23 +1100 Stephen Rothwell <sfr@...b.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