Message ID | 20240125123327.4e2825ab@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-37853-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1358729dyi; Wed, 24 Jan 2024 17:33:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFdXdFH5/C6Fcx+hRUIbpuGvqEB0P0GMwDBoCsDiqYIfgR10oTgR++aE9l7PZ5SnWNFiK9A X-Received: by 2002:a05:6214:194c:b0:681:78ef:3b6 with SMTP id q12-20020a056214194c00b0068178ef03b6mr452709qvk.38.1706146432759; Wed, 24 Jan 2024 17:33:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706146432; cv=pass; d=google.com; s=arc-20160816; b=woSVgU7ywrDb3kh0B4oquG1BskLaNWWeBFoBziHyqp6RPQIYtaEs8T6vcKWXMm0zdU Po47IKoBmxcXXnDlSRdpjhkUD9hOzRFLSE27H3xizcVe6cefc3yJaPmiyF5OGUE6D4Pk xI9nKbhNR5yDHMr3APEGFXhGQdcmkLy7c+yVHSRNzlNVMRFqNLokQK1du9yOrwCzONK9 PAen7Sfrd73JwFrufYV0liHm1NUDHRJLbcSd1LFeJ4cHz/rM8umqC/U0HAu667aFJ172 fc0GTeaApQA19UoPW38WGwRebjmh3VM4Nb03N7sNIBjgjtMUVSkoIGjFkWwV9Yc5zIOI yYGg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=OMpz/Ji0fdOajaSAOBxQ3VgIldu0JQQGzsMSMM/0E3E=; fh=fnBgkM1O30I2d2DMMGcWBC0C7pshUOk/lVUV61TXxvQ=; b=EMzw2t0egSF6CUsMy7L1Ueq987g1GKzziDf/aLWt3vdhau9z/SFPhzEaen3LLFtZMS lV9z9zMOTQ0GZSwRVLx25h2mvqAPWUPQM5+OtrO6nKzh4pCaay4gwq1nsalx19LcpIXT aQ17oNs9HTsOYHBiLTZEZqKIwiDqWbYLXH+9vDAwFTXlpaLfhUkg4a1MKBZh9VuEsDho IJEYFvIDouWkCswqPqUoWWlRmNgdOXgq9hPz7IwcuWpQiaaPzTQqngEM/tbVNq6tV6bh J5/8WQzDIeg1J5keURdQipYV85QUnDZlwH8mNMoUVlDI/1HcWrt6MaqKkmKkYpNkC8/e 3zfg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=HwXyssm6; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-37853-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37853-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id u10-20020a0c8dca000000b006869c9dde0asi5419395qvb.497.2024.01.24.17.33.52 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 17:33:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37853-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=HwXyssm6; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-37853-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37853-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 89A871C221D5 for <ouuuleilei@gmail.com>; Thu, 25 Jan 2024 01:33:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F1AB5613A; Thu, 25 Jan 2024 01:33:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="HwXyssm6" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DE0AEA9; Thu, 25 Jan 2024 01:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706146416; cv=none; b=Pq28U947J4osuKfhlbf4nEdqY7wDQfzvwtYbzqoI8yBiweGC8JGVPfC61zFKh0o5++K5lWyKwzLToAd16qPcZV34ISJAPBKrA0I8ruH52I2W2l0ae0VdYjUKGg2AZPSe1RGbnlGfA113s3ATY5RqGM5I0Qxm4KWyQ8st/3tfdnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706146416; c=relaxed/simple; bh=jU/2S0TPmYwsFAEcLm1nhe1J12jMGQjYbEw/4xSLtXY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=BS+MopigDWEwPnwsCLnIQ0EfBU+zlRw3xdPx9TzXPuSDy/mnT2GsMbuly+HrHnMZVYb+Cr6MKPMl9eCaJLAfUhl7Zu/kmzuxEKgy72GaY+11Bc/fLEzFRXSO5TNg3h9qt9NxxKwHKUdoRnZAcEqMPqRzEDNhkVazKNIiadcdVFU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=HwXyssm6; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1706146411; bh=OMpz/Ji0fdOajaSAOBxQ3VgIldu0JQQGzsMSMM/0E3E=; h=Date:From:To:Cc:Subject:From; b=HwXyssm6v0JDKe7PoaSDeqQFetH7S+3t4YlnxNCkg6vs6JwK71kXPwRlWjLp+B+DS wXtum/h1A1VvR5Cakqtudn0Ay9g2o63PanmNFtTd56q98JuNAbpHu/vOx+lz6KC+CU V7+YYaAWWfkeWi/DZKDzeYT2+HzT3tpZCnEo4eVoR/ilCMquczSuA67d2x07AIry+m XlATYHNsYP5K2kxWMB4tYmQlghh1RVjxhUAHaZ8WzM9vxMfthRRQMTRj3ughhM6dfX /kHQijwmlvMULyeJTV1FW3dKFgY62obiFS16IGDZoe6iTawu1AwcgNNHSBoVkIeCTJ peCsVZTG+iZbA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TL3Ht63XHz4wcg; Thu, 25 Jan 2024 12:33:30 +1100 (AEDT) Date: Thu, 25 Jan 2024 12:33:27 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Kishon Vijay Abraham I <kishon@kernel.org>, Vinod Koul <vkoul@kernel.org> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Mantas Pucka <mantas@8devices.com> Subject: linux-next: manual merge of the phy-next tree with the phy tree Message-ID: <20240125123327.4e2825ab@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/P.9/+PAaV=dIUGYBEyvUrXX"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789024201691841831 X-GMAIL-MSGID: 1789024201691841831 |
Series |
linux-next: manual merge of the phy-next tree with the phy tree
|
|
Commit Message
Stephen Rothwell
Jan. 25, 2024, 1:33 a.m. UTC
Hi all, Today's linux-next merge of the phy-next tree got a conflict in: drivers/phy/qualcomm/phy-qcom-qmp-usb.c between commit: f74c35b630d4 ("phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018") from the phy tree and commit: 52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling") from the phy-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Comments
On 25-01-24, 12:33, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the phy-next tree got a conflict in: > > drivers/phy/qualcomm/phy-qcom-qmp-usb.c > > between commit: > > f74c35b630d4 ("phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018") > > from the phy tree and commit: > > 52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling") > > from the phy-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Thanks Stephen, this looks good to me. I will notify Linus when he pulls this BR > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c > index 6621246e4ddf,e62539ce99a6..25d8d881b2f3 > --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c > @@@ -1621,28 -1385,8 +1393,24 @@@ static const struct qmp_usb_offsets qmp > .rx = 0x1000, > }; > > +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = { > - .lanes = 1, > - > + .offsets = &qmp_usb_offsets_ipq8074, > + > + .serdes_tbl = ipq9574_usb3_serdes_tbl, > + .serdes_tbl_num = ARRAY_SIZE(ipq9574_usb3_serdes_tbl), > + .tx_tbl = msm8996_usb3_tx_tbl, > + .tx_tbl_num = ARRAY_SIZE(msm8996_usb3_tx_tbl), > + .rx_tbl = ipq8074_usb3_rx_tbl, > + .rx_tbl_num = ARRAY_SIZE(ipq8074_usb3_rx_tbl), > + .pcs_tbl = ipq8074_usb3_pcs_tbl, > + .pcs_tbl_num = ARRAY_SIZE(ipq8074_usb3_pcs_tbl), > + .vreg_list = qmp_phy_vreg_l, > + .num_vregs = ARRAY_SIZE(qmp_phy_vreg_l), > + .regs = qmp_v3_usb3phy_regs_layout, > +}; > + > static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { > - .lanes = 1, > - > - .offsets = &qmp_usb_offsets_v3, > + .offsets = &qmp_usb_offsets_ipq8074, > > .serdes_tbl = ipq8074_usb3_serdes_tbl, > .serdes_tbl_num = ARRAY_SIZE(ipq8074_usb3_serdes_tbl),
diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c index 6621246e4ddf,e62539ce99a6..25d8d881b2f3 --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c