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=-5.8 required=3.0 tests=BAYES_00,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 42900C4320E for ; Fri, 23 Jul 2021 19:55:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A76B60F46 for ; Fri, 23 Jul 2021 19:55:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231310AbhGWTO1 (ORCPT ); Fri, 23 Jul 2021 15:14:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229657AbhGWTOZ (ORCPT ); Fri, 23 Jul 2021 15:14:25 -0400 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5601BC061760 for ; Fri, 23 Jul 2021 12:54:58 -0700 (PDT) Received: by mail-oi1-x22f.google.com with SMTP id z26so3013213oih.10 for ; Fri, 23 Jul 2021 12:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fAZFNKtfJy2tBmSXGgFB+64YhzMY2sE6d9fBKVXjEgU=; b=IgsdNh8hpYiR0E6gJloGDtA3nuwQzZaw1e3IzVvDKDNACdDncmDRIpVuXlq4aYu6V5 z7fBW3mxaygpa/LOYmAxADp+AmmdJsjtaHkxdQCtN+TR3wxv+tOXprvn9gWVlVHqSd4U LM5YMxXrcGuXZk72+L9Wr1c2dJ4R6PDG01KcTdwhaQHz2+9X5zgMytH6aipPss4VEEBG HphWWvnWSy3qt9gHlck4HNue5RSXesITFxr2zbw/Bu2vPBJoitmrSm3nkjreYqzSVCLm zTB7SGVCPkFCVfduL9dgIBlBYXmoeG3KyNkKT04S5r5geFhX+vBMXe685i/fUzd2DDTP i4BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fAZFNKtfJy2tBmSXGgFB+64YhzMY2sE6d9fBKVXjEgU=; b=l5/VmCKGCN1/BqyaImM6x39wgzRotdNf43Y38+uEWk2g+17BJtk1cOyaGp+c3cDCBw 6roFj3ngBTCHzOkKJ92YYwyH9t1Eg8sRYIGLKpsxwwepSS2M11wpw/2KgrAlkI9cOqd7 j3d414XAdXWLkRx4CCwrYKib84DHhcfQh7XqU+8CeFj2/7JAr87FlFbkD10ql58H1F9D cqMZVzIJfV69+kTXUtAlv8ooHgcVHX8XXEIbZSI4mcoXCNMHuHt3KhVp9ZiDx6P/wllf wgE3rDq2xANH9ENVAtmhloXQisS56HR3WDgYRWl1zcktKsG9Y1lRAgBmpwg4t1CWFTiI +jDw== X-Gm-Message-State: AOAM532DODGyvoZaQ6qAqsY9iRXzOvfc9TU7oADwp1U5NGAx6ahQW/Cd 60B7OtzbVU0Gl9gYz5N2zlkvSw== X-Google-Smtp-Source: ABdhPJzhHqN66w+C/2xjphTeEC2y3ut4LgJecMAc08lmKvS3Pi7OZOlW2DDNpbkaHWOqg09wpxzkCw== X-Received: by 2002:aca:f58e:: with SMTP id t136mr9596506oih.33.1627070097639; Fri, 23 Jul 2021 12:54:57 -0700 (PDT) Received: from yoga (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id u7sm1427999oop.11.2021.07.23.12.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jul 2021 12:54:57 -0700 (PDT) Date: Fri, 23 Jul 2021 14:54:54 -0500 From: Bjorn Andersson To: Greg Kroah-Hartman 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-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-kernel@vger.kernel.org On Fri 23 Jul 10:54 CDT 2021, Greg Kroah-Hartman wrote: > 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? > I typically don't merge back the -rcs into my -next branch, is that common practice? But I still don't understand why you insist on driving this through your tree. I've asked you several times to show me on the patch so I at least can Ack it. I made a mistake, but why do you insist on keeping me - the maintainer - out of the loop? Regards, Bjorn