Received-SPF: pass (google.com: domain of linux-kernel+bounces-19158-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Feedback-ID: i787e41f1:Fastmail
Date: Mon, 8 Jan 2024 08:53:26 +0100
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rob Herring <robh@kernel.org>, Kyle Tso <kyletso@google.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the usb tree
Message-ID: <2024010819-isolation-android-5d2d@gregkh>
References: <20240108150026.2c5930a4@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240108150026.2c5930a4@canb.auug.org.au>

On Mon, Jan 08, 2024 at 03:00:26PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the devicetree tree got a conflict in:
> 
>   Documentation/devicetree/bindings/connector/usb-connector.yaml
> 
> between commit:
> 
>   501b15207138 ("dt-bindings: connector: Add child nodes for multiple PD capabilities")
> 
> from the usb tree and commit:
> 
>   0d3a771610d0 ("dt-bindings: connector: Add child nodes for multiple PD capabilities")
> 
> from the devicetree tree.
> 
> I fixed it up (I used the former version as there were other changes
> in this file in that version) 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.

Fix looks correct, thanks!

greg k-h