| Message ID | 20230925131607.7a71254f@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp952061vqu;
Sun, 24 Sep 2023 20:17:47 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IE67oqHSFppqan5I5lWU2YAefipz/QaqPxU5egiRtRmXre+eVFH07QLjOKIA+0fOBPxBMbL
X-Received: by 2002:aca:1c14:0:b0:3a7:b4e8:563e with SMTP id
c20-20020aca1c14000000b003a7b4e8563emr7231238oic.38.1695611866748;
Sun, 24 Sep 2023 20:17:46 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1695611866; cv=none;
d=google.com; s=arc-20160816;
b=crnaS7eE5lUqL251f/5cMAh9PD5gBEdFjcWrmItYKK0tD5xa7w1wuNKa2AyY2YkXwA
aod2Hn3UiK6bYafxzA1swZkMhiuaGkvoN44mlwd5aAaB5LAKZ+3jqXheilewt45kO3/a
BYfK3Yr4s4Db/i/nvtm4pAGqxVRlWyK1rKHDq9ValodhYRCUXAhB7RQSFumuyJz9Wy1F
H3cGJulqMLx+E3KTRif5CFtTn8w58Z4oRVZ7+D9ZppqgGfpsGkz89FhhY+o49ivh2hXG
x9pRUPPD/QBGWbNAowWcGKvpkJJFr1oDbba+/i0WLgyBVb4ATNpUwV5EUX7rAsMbOQgF
lHFw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=IbOLLWCtNmvTBpTRJAEhO2mJOGjVP6fyeHq9AFXzBaw=;
fh=JK7jHZSs+GAt5ueT3KeFR18fw4IQEkIPCSWMgbVqmlc=;
b=Yrxv3G8Ui3M9TxRwNFG2mZ8ZSq/HW+guzDy3jjVt9YjNXE1YXDJ9iIJqrOtE1fxivM
eANsD9RATy8Y4PPmQOUYXUWwumlAI+7CdZVXUTyO1kRxnX6jNbmXwJTrCbxtrlNnjGw4
CneX7Z4ykEQfxPe9+6Jq4ymjV5U7Y12ap+JMnPis0Nke9Qxi5jjJb72VKbG08XQrJCg4
FAAsKNhbTmDX8WOSnjKHB8oz8AMxTzmOCGO5frYIHUPu6fNUpekq00Zi2kMe3heTqMDC
dAUevP7Qw2VTsgyJbi0ViwukTw7qhy/UEs9ub538TTj5KZUr6ldg9NfD1RAsgnUTQ9hB
DX4A==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=jN1jvs+l;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from fry.vger.email (fry.vger.email. [23.128.96.38])
by mx.google.com with ESMTPS id
a13-20020a63d40d000000b005780c629ec8si8903117pgh.617.2023.09.24.20.17.46
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 24 Sep 2023 20:17:46 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=jN1jvs+l;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by fry.vger.email (Postfix) with ESMTP id B96B9802174A;
Sun, 24 Sep 2023 20:16:26 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230038AbjIYDQT (ORCPT <rfc822;ezelljr.billy@gmail.com>
+ 30 others); Sun, 24 Sep 2023 23:16:19 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40740 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229634AbjIYDQS (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 24 Sep 2023 23:16:18 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A42FDA3;
Sun, 24 Sep 2023 20:16:11 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1695611768;
bh=IbOLLWCtNmvTBpTRJAEhO2mJOGjVP6fyeHq9AFXzBaw=;
h=Date:From:To:Cc:Subject:From;
b=jN1jvs+lcyBnjETK8LI2jW5JEFSXWx4vXlNnnhb9sgh47lYIguC4dlWq/zwTemq0c
pWISYSHBOpFEHoBkAeBM9NYtARRAI/1f9PtJuhxQO0qwKsKNixi4Y/wDaE1JIgZ/0M
SMCme8p4s30pXqllMbCAIt5Hopad2t+7QWDlPaE4z7xQ6QbgU6UpUBlwtTFKis/gYd
lWj75nWfOCUjQCJLJeutlpKxT6uraQ3BxwR2qCpGp+2s0xPGGEtSi7lPuAO9z7Q09M
/PAXAmBap5HCbyZMECFuQQwYbjnnAddr1pOSj2UZZRGhE4+/GUzYJ08EIAPWfQOMKd
wG9+UndlPLMug==
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 ECDHE (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rv7Lc4wZqz4xGR;
Mon, 25 Sep 2023 13:16:08 +1000 (AEST)
Date: Mon, 25 Sep 2023 13:16:07 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kishon Vijay Abraham I <kishon@kernel.org>,
Vinod Koul <vkoul@kernel.org>
Cc: Adrien Thierry <athierry@redhat.com>,
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: linux-next: manual merge of the phy-next tree with the phy tree
Message-ID: <20230925131607.7a71254f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.gR1P+1sU_QRornL/vSKo5+";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]);
Sun, 24 Sep 2023 20:16:26 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1777977908852139128
X-GMAIL-MSGID: 1777977908852139128
|
| Series |
linux-next: manual merge of the phy-next tree with the phy tree
|
|
Commit Message
Stephen Rothwell
Sept. 25, 2023, 3:16 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:
c599dc5cca4d ("phy: qcom-qmp-usb: split PCS_USB init table for sc8280xp and sa8775p")
from the phy tree and commits:
7233090aba54 ("phy: qcom-qmp-usb: simplify clock handling")
fcf63482f6a9 ("phy: qcom-qmp-usb: rework reset 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
Hi all, On Mon, 25 Sep 2023 13:16:07 +1000 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: > > c599dc5cca4d ("phy: qcom-qmp-usb: split PCS_USB init table for sc8280xp and sa8775p") > > from the phy tree and commits: > > 7233090aba54 ("phy: qcom-qmp-usb: simplify clock handling") > fcf63482f6a9 ("phy: qcom-qmp-usb: rework reset 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.
diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c index c69577601ae0,2a094f2345f0..000000000000 --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c