Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Feedback-ID: i787e41f1:Fastmail
Date:   Wed, 18 Oct 2023 09:56:27 +0200
From:   Greg KH <greg@kroah.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Rob Herring <robh@kernel.org>,
        Abdel Alkuor <abdelalkuor@geotab.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 usb tree with the devicetree tree
Message-ID: <2023101818-recant-goldfish-44b0@gregkh>
References: <20231018131334.5fb47992@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231018131334.5fb47992@canb.auug.org.au>
Precedence: bulk

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