Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i787e41f1:Fastmail
Date:   Thu, 19 Jan 2023 13:05:57 +0100
From:   Greg KH <greg@kroah.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
        Thierry Reding <treding@nvidia.com>,
        Jon Hunter <jonathanh@nvidia.com>,
        Wayne Chang <waynec@nvidia.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the usb tree
Message-ID: <Y8kyJcSYW0IOMuzU@kroah.com>
References: <20230119152605.03588e9b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230119152605.03588e9b@canb.auug.org.au>
Precedence: bulk

On Thu, Jan 19, 2023 at 03:26:05PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the tegra tree as a different commit
> (but the same patch):
> 
>   2648f68bd0ac ("dt-bindings: usb: Add NVIDIA Tegra234 XUSB host controller binding")
> 
> this is commit
> 
>   20cdc1607ea0 ("dt-bindings: usb: Add NVIDIA Tegra234 XUSB host controller binding")
> 
> in the tegra tree.

Is that going to be a problem?  Git should handle merging that just
fine, right?

thanks,

greg k-h