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 X-Spam-Level: X-Spam-Status: No, score=-7.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98D34C432BE for ; Fri, 23 Jul 2021 15:55:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8769E60725 for ; Fri, 23 Jul 2021 15:55:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235783AbhGWPOe (ORCPT ); Fri, 23 Jul 2021 11:14:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:51646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235702AbhGWPOX (ORCPT ); Fri, 23 Jul 2021 11:14:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 592D260725; Fri, 23 Jul 2021 15:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627055696; bh=gGq+nFNtYhXh8+LTHNU1d09X9anaFb/jJcdQ6OGEm6w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=w7TXf5P/3VOLNqa3IGJS+/tL1WqsO3lubM2fNseWUGtviwChA0JbxioddqK5Xebzu VBKcT7W2dFhFjKmcOBccaxPRa5CzvwMBY/+1zUDb1IQTjrxjksklcYYYeIcEmsMOL3 /z4TEJgfF9/B/bm0KWjIW9F/WJgTnJpsvFiJnY0U= Date: Fri, 23 Jul 2021 17:54:53 +0200 From: Greg Kroah-Hartman To: Bjorn Andersson Cc: Serge Semin , Krzysztof Kozlowski , Rob Herring , Serge Semin , John Stultz , Felipe Balbi , Florian Fainelli , Andy Gross , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , linux-arm-msm , Linux USB List , lkml , linux-arm-kernel , Amit Pundir Subject: Re: [PATCH 29/29] arm64: dts: qcom: Harmonize DWC USB3 DT nodes name Message-ID: References: <20201020115959.2658-1-Sergey.Semin@baikalelectronics.ru> <20201020115959.2658-30-Sergey.Semin@baikalelectronics.ru> <20210714124807.o22mottsrg3tv6nt@mobilestation> <20210721100220.ddfxwugivsndsedv@mobilestation> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org On Fri, Jul 23, 2021 at 09:34:20AM -0500, Bjorn Andersson wrote: > On Fri 23 Jul 03:18 CDT 2021, Greg Kroah-Hartman wrote: > > > On Wed, Jul 21, 2021 at 03:09:37PM -0500, Bjorn Andersson wrote: > > > Which tree did you revert this in? 5.13.stable?) > > > > My usb-linus branch which will go to Linus later today. Then we can > > backport the revert to older kernels as needed. > > > > I'm not worried about the backports, I'm worried about conflicts you're > causing because you're taking a non-usb patch through the usb tree. > > I was about to push a revert (to this and the other Qualcomm platforms), > but as you're taking some set of reverts through the usb tree we're just > in for a bunch of merge conflicts. It shouldn't be a merge conflict as you can apply the same revert to your tree now and keep on merging. When you pick up 5.14-rc3 from Linus it should merge "correctly", right? thanks, greg k-h