| Message ID | 20231018131334.5fb47992@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id
ib8csp4516772vqb;
Tue, 17 Oct 2023 19:14:06 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFz1tPU0mejg01DQzBM/VlAtNP7XBUzED5HoLgJv/IeVW1BXu8v5eot6QdFZhlbUhYGWRr+
X-Received: by 2002:a05:6871:468d:b0:1d5:1a99:537f with SMTP id
ni13-20020a056871468d00b001d51a99537fmr4178695oab.2.1697595245659;
Tue, 17 Oct 2023 19:14:05 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1697595245; cv=none;
d=google.com; s=arc-20160816;
b=jCRErRnskrKY2q6Tb2G5H1vY9UomMU17o48ZFhZ6GZnC3rzc8bgCuo6K2/EYaIXLIW
gWOM9uLp+roMWON4hYWVzRa+BRcR0XlaHI1md5nJhhGj+uJdsDHK/x/7t6FdvQ3+tdGb
nMpwUPmnqzAHRf+UorGBKRhwL6OC+uatAYKHV40elyq0B/H4qYy72gdp9ZhzLmvMD+1/
MDI9JLtB5pUBlsHACzR9YZunLbM4SnWozhoC5hPxFYo+rJQOjUvjWOxEGl5v7Cz4UfB+
Zk7aI0VyySnStRqPEBZ/POISWLxIJBbTAIaPNFrjiInfbfHnAGh6KNaQKJZtPZC5TI4S
7KzA==
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=B3MoQ0UHZVQYnHEgV4JwPrpwPSToPMi2A+OnnFE0glE=;
fh=77/mWiqiar2PUxsnHK/gC7tJXn798Gc5ycMcRpLZQnE=;
b=U8RKhwX5YWZlT2SzB5NqGH02IvHaJDJh4sTWxkAucl18lyKGQkpZ6Peyo4XjtY5RnP
Wod7ws4z6xCxzj99/7XpfgKqo+6oVDXlS75T/soAoDl0KMtEwX01ibV+kdbr/8UNvxa6
48uYU8maeMTCxc1RQfDc5oh+xQIVUzmG+NaUAT76GUQl/x8DjRXnBiS6xYcRbbSP2hiI
5NWNG2dMIvUYYk4kwiVb/3mAjks8ogoyj+iGqXlJGbrc5HHRLRAxPlGc9UiudQmDSYCV
4FWnxwIhc8YybM8gGSXSk9L1kfT2g6GzMu5cfWxbl99I6/7yXKBTaLYH8N+f7M7PvgLr
wRuw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=YtWAmdo2;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1])
by mx.google.com with ESMTPS id
bx28-20020a056a02051c00b0058986c3dc2fsi1270019pgb.117.2023.10.17.19.14.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 17 Oct 2023 19:14:05 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 as permitted sender)
client-ip=2620:137:e000::3:1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=YtWAmdo2;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id AE27480E70A5;
Tue, 17 Oct 2023 19:14:03 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229460AbjJRCNo (ORCPT <rfc822;zwp10758@gmail.com> + 23 others);
Tue, 17 Oct 2023 22:13:44 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40808 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229453AbjJRCNn (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 17 Oct 2023 22:13:43 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EF4DF7;
Tue, 17 Oct 2023 19:13:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1697595216;
bh=B3MoQ0UHZVQYnHEgV4JwPrpwPSToPMi2A+OnnFE0glE=;
h=Date:From:To:Cc:Subject:From;
b=YtWAmdo2Gn5YTCeut34j4G6KApPR7yyZ6AeCDWJP5RsR9XNy7utQ+zfJqdSsusQ83
aHwM7OkINc26mCTocHn6KnQV31zj4uM6K5xTHBahxS1yGasqbx4tmGQp/CacHBu9PV
MVb+vtOFY0C0Awq0i6v0Xw7F8NpV/JccdV9KIFOFQARmv7PAD/z7v6sswqn4wylanY
0bcLYJCBPFGOOtu1f1LG8ATYn9ojvdXNdbtzdP0+YD1hfG3fYysyCD+NeVRREzMkBq
1kYiIp1HWyM2ltwvp4yjLOCvWl4WtL/xDlPBVtX0CG2/pNJ9Y9goodVEhooJKohkrL
x937QMrnS+Y+A==
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 4S9Dsr2VB7z4x1v;
Wed, 18 Oct 2023 13:13:36 +1100 (AEDT)
Date: Wed, 18 Oct 2023 13:13:34 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Rob Herring <robh@kernel.org>
Cc: Abdel Alkuor <abdelalkuor@geotab.com>,
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 devicetree tree
Message-ID: <20231018131334.5fb47992@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_Btt2PWcY33XfiDzmI/Qaaf";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.8 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 morse.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 (morse.vger.email [0.0.0.0]);
Tue, 17 Oct 2023 19:14:03 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780057632717193309
X-GMAIL-MSGID: 1780057632717193309
|
| Series |
linux-next: manual merge of the usb tree with the devicetree tree
|
|
Commit Message
Stephen Rothwell
Oct. 18, 2023, 2:13 a.m. UTC
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
between commit:
47b8fb4aef95 ("dt-bindings: usb: ti,tps6598x: Disallow undefined properties")
from the devicetree tree and commit:
6060d554e891 ("dt-bindings: usb: tps6598x: Add tps25750")
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 Wed, Oct 18, 2023 at 01:13:34PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > Documentation/devicetree/bindings/usb/ti,tps6598x.yaml > > between commit: > > 47b8fb4aef95 ("dt-bindings: usb: ti,tps6598x: Disallow undefined properties") > > from the devicetree tree and commit: > > 6060d554e891 ("dt-bindings: usb: tps6598x: Add tps25750") > > 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. Looks good, thanks! greg k-h
diff --cc Documentation/devicetree/bindings/usb/ti,tps6598x.yaml index 6ab674dea4c6,72ac534e6ed2..000000000000 --- a/Documentation/devicetree/bindings/usb/ti,tps6598x.yaml