| Message ID | 20240222153826.3f7eba10@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-75905-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp31513dyb;
Wed, 21 Feb 2024 20:38:55 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCWoUKu7C/ben0AH6dUpQsOLcDmSKuJVNfTDshM5bOUc/epmlwhYva2Ec/zrEk8Gts+TLtxloPPor9+ZW5A3TuDaGdVNHA==
X-Google-Smtp-Source:
AGHT+IFVxtRajFHQV4Z62lklx9Lc3Vcrd+AKUtaDUQ2l11wpf2V67zpoTaYdGypMW/w3jhGpDu8h
X-Received: by 2002:a05:6a21:9217:b0:19e:cf1a:5369 with SMTP id
tl23-20020a056a21921700b0019ecf1a5369mr2688752pzb.24.1708576735249;
Wed, 21 Feb 2024 20:38:55 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1708576735; cv=pass;
d=google.com; s=arc-20160816;
b=GqnDoh4IhhZl5w2VxFdmNk3/OboY3zm1akC1N8YX0YIo6cZQ7rXMEsRXCtF7OE2/KZ
/EY1/HtnGA2x49n+zxKLaHSt/DXO+JForCA9WhP00pCSv/1U6H0CCabBZID5B7RMgetR
ZlbkMZRvRutAbSECNLVtkYP76F29ZjYUkwefZLWNvLsEbidZoCvOR+1aIlMsAYQatNff
k0UngTNLSPJ1HysrGaJbHGI1gch11nxy0e9tBg6YhdYyxtpyybJFCtAFkaQ4qVaN6WNV
m21Tg9JtHB0jAat/inmzRnAusfUmKpTcgks3bg4iaFQNzyIz9gZNrX3Ze4owmLzxCisD
Npwg==
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=U2MzncGXbDNzCtp+gQ0mCYGLNdNGYclqHp3bgczOtZw=;
fh=SxDsysKtDv4S8/9QK4IUnwluZjHWPcx8ECXdBasWgcc=;
b=wkb4qe6VnYtMquNV2COVvsWcyl7pfHTbVhFNWp2zXIbyeblnglf7gHqvoY7hCJgQtn
eyUb5VuNG/51fV88hSNnjTBmQLPci5UVAGJSnbfPYKP8wZvZkVpLRm74bwGZsrxqXcTL
B4YRRHSqyxV4Br1+qm+MByjtjVlItNrh94izH075NY9o+jmsSOpmZXmHw1g27uMDMnX9
eyE+BDtaj1N2riImzOqK0hYATYfb54Ii0UFqn1l+2Q83xXDHPM5LvvzNzFlOWKlx7vA7
s/AUEyIPIev33hlEs6qwg/89QGlYjp+nWU/ohf+uDEYcFLX6EHlghJBfl6sASYSX/P6k
pt4A==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=b226THhz;
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-75905-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.48.161 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-75905-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161])
by mx.google.com with ESMTPS id
s35-20020a056a0017a300b006e4700a00c4si5795885pfg.335.2024.02.21.20.38.54
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 21 Feb 2024 20:38:55 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-75905-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=b226THhz;
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-75905-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.48.161 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-75905-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 6D939B2347A
for <ouuuleilei@gmail.com>; Thu, 22 Feb 2024 04:38:49 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id D6DA75CA1;
Thu, 22 Feb 2024 04:38:37 +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="b226THhz"
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 E670F10E6;
Thu, 22 Feb 2024 04:38:31 +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=1708576715; cv=none;
b=vC38pq7AFgw9ukYPVSQOzTU5BMtwluvv+6pZCY93vCM2wMhrOHEjQSMco+la/u9K7TwJdjcun5Cxk2Vkz+gW4islPzPcpnh8k/HSH9kwq5Z15xtB4gt7+yaGu+zWjuPugiCA5m+6sZdkVSo5utnXW9Uqbqxims+cd1SC5Ev4ghE=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1708576715; c=relaxed/simple;
bh=YyiHPo6lpjIRrcpkojOn+UeZ2kGiQoAWAAYO9zWyQ4I=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=XVPbtAB1MJxLkhaxeabdZ+SayztcPYs78XnhBQ1Eqt8nQvmloEhLgg5JIsFeXZ5o297TncDYdj4RZDJSMSKp4+UnxJShC5+/lNvfSyiIuT64yHGxPSBpd4GHQRG7Xft7rzJ/YsCaHrf41cov0/A1I9h1kqvj5f4rGUWN9JUZZYo=
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=b226THhz; 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=1708576709;
bh=U2MzncGXbDNzCtp+gQ0mCYGLNdNGYclqHp3bgczOtZw=;
h=Date:From:To:Cc:Subject:From;
b=b226THhzDEKCWHO1KuzBnZPQiqyJboqL3m3KC7VLI7ej3a1Hxxc9zVoOrVSHDj3JR
ey+/KdHQf50s8kHSiAsSrdAW8oJgJN+x+m6oKxnSDPlbvFQ5inEHJtyuXGvE/cLDzd
6dPYXcVWL+dWwoc52cO93HVv0TV3fwZbU59CkIor/7ExXTdW1qNNqQ6qJVEpFPkhZ8
752nYisHwNqZEdmrVGuxwq338eKV+iiiSXT76vNnMB0fQEBihsPxrxPYu3YatAicf/
tPhPakIxzKk9QbfK1aey5ibTtdEtUQUYBIYOtoRjERmwLhH4508JmJe5sSirqUk+MY
VUH4oUYOJqUuQ==
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 4TgL4N1bPmz4wc4;
Thu, 22 Feb 2024 15:38:27 +1100 (AEDT)
Date: Thu, 22 Feb 2024 15:38:26 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Mark Brown <broonie@kernel.org>, Liam Girdwood
<lgirdwood@gmail.com>
Cc: Danila Tikhonov <danila@jiaxyga.com>, Dmitry Baryshkov
<dmitry.baryshkov@linaro.org>, Greg Kroah-Hartman
<gregkh@linuxfoundation.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 usb tree with the regulator tree
Message-ID: <20240222153826.3f7eba10@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_/Z2LrkZarDBZRFQAea+V8Pww";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1791572558938305906
X-GMAIL-MSGID: 1791572558938305906
|
| Series |
linux-next: manual merge of the usb tree with the regulator tree
|
|
Commit Message
Stephen Rothwell
Feb. 22, 2024, 4:38 a.m. UTC
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
between commits:
ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible")
b9262cc1b988 ("regulator: dt-bindings: qcom,usb-vbus-regulator: add support for PM4125")
from the regulator tree and commit:
ef6035d2f1f4 ("dt-bindings: regulator: qcom,usb-vbus-regulator: add support for PMI632")
from the usb 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 Thu, Feb 22, 2024 at 03:38:26PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml > > between commits: > > ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible") > b9262cc1b988 ("regulator: dt-bindings: qcom,usb-vbus-regulator: add support for PM4125") > > from the regulator tree and commit: > > ef6035d2f1f4 ("dt-bindings: regulator: qcom,usb-vbus-regulator: add support for PMI632") > > from the usb 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml > index 8afb40c67af3,66dcd5ce03e6..000000000000 > --- a/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml > +++ b/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml > @@@ -24,8 -24,7 +24,9 @@@ properties > - qcom,pm8150b-vbus-reg > - items: > - enum: > + - qcom,pm4125-vbus-reg > + - qcom,pm6150-vbus-reg > + - qcom,pmi632-vbus-reg > - const: qcom,pm8150b-vbus-reg > > reg: Looks good, thanks!
diff --cc Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml index 8afb40c67af3,66dcd5ce03e6..000000000000 --- a/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml