From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DC84C004D4 for ; Thu, 19 Jan 2023 12:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230143AbjASMGL (ORCPT ); Thu, 19 Jan 2023 07:06:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229760AbjASMGH (ORCPT ); Thu, 19 Jan 2023 07:06:07 -0500 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75289114; Thu, 19 Jan 2023 04:06:02 -0800 (PST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0B4905C0068; Thu, 19 Jan 2023 07:06:00 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 19 Jan 2023 07:06:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm3; t=1674129960; x=1674216360; bh=G79ZgDoEhs aOdA4/jWWEPcYdJ3ASPN551GkohQhqETg=; b=K6fp0wD67afq94tpgRf7r9QtIE fI1DUx3wp2BTV3VMX7xef6Aw3WnurOIIE2J328FJKtUlvwrjN2577w24H4aJnAN8 DLWRAgw3mV1U58Ef/cKRGCRLsKCKcDXVfmzlSyaEQqmVS8MDr3qg1F5SfTuvEWPN 3vejKIMBdurXagnEs0fJqo8l/KUXoYNUnrNSMpgcK5ACSKelWhSk/8nLe4k9SjaC ljgUcTVdVabquwiCxeT9H5DshjgWA/eH9ShkeQyncG/3AKFx/9x19q3lIa0I6QVg I2rbequH2W1jETykerCrhXz3c6L0WzgkI2O0Hnd1ZAXU2o0rrS0S60i/axMg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1674129960; x=1674216360; bh=G79ZgDoEhsaOdA4/jWWEPcYdJ3AS PN551GkohQhqETg=; b=qzFebiLY8baHfXBBGyi/W+qdSc6RbLYRCS0W0oIWmGNz mIkUtLiks1XL3OZtHgnORGz+okgt6hZYFLcYrnXqF9noT4T/yKshkHBCkJY7l+x5 gaHmCHPGp6bd3N/9qpPwoBch+TkAIPVQH+5nIum0C+kDSyGBR9sAaYIBN1Z8XUtr XIMFzUPUmDuSblp91UKiGw3ifDgan7szNK6sQLJaZCT5pwqO94/y9nFIpsigoTJX Zumk8KRaLP/aLkZQuXikQkfaEv5cWF1PLbJHvz+teLM1pAtB4zoxc/h7dYC91Peb r3EBVCpSUx4Pn06QbwNSXlfE8xkU2awNdaT8DAqkIQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddutddgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 19 Jan 2023 07:05:58 -0500 (EST) Date: Thu, 19 Jan 2023 13:05:57 +0100 From: Greg KH To: Stephen Rothwell Cc: Colin Cross , Olof Johansson , Thierry Reding , Jon Hunter , Wayne Chang , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patch in the usb tree Message-ID: 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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