Messages in this thread | | | Date | Mon, 19 Feb 2024 11:43:49 +0530 | From | Vinod Koul <> | 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@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
| |