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.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 ECC38C4338F for ; Sat, 24 Jul 2021 07:52:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCBC960E95 for ; Sat, 24 Jul 2021 07:52:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BCBC960E95 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XmwOZyhyf5KXfn/nVPa+JkJoI2ur0aIsvjPW1ImZPLY=; b=KRzdzIhVBR9sFE P2UhegHQvrs1S4IEHEOq2/VT+LvLEJbn2nLOdgw/TIK4Sq5Y1XFhirt3Y2MvEIUOuQNPIMau8wPSG ME6Gl7xoCKKWOBTVlYlN4C05sbTxyLkiaW7vc7waJhlBV+jPzsprHxgCs78rLtALOrGtg4LIRYf6e N70xqODIYwCq/2Dqsq801YcMw/jqNV02+/AXM8tcBcuqPoP6/IX3Zpf8KpAC3G9qcH0rmv7e07z08 kPQHDnTon+/e3/gH9iRpyHgQWov6u6707JphY/XjRcZTApvVOwzYejPNVcwmgikwi5zPB15UVlJMv 2Cu4f7CmmZEySgWxaDzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7CQM-006qhI-MM; Sat, 24 Jul 2021 07:50:18 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7CQJ-006qgx-A8 for linux-arm-kernel@lists.infradead.org; Sat, 24 Jul 2021 07:50:16 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6C9D060E96; Sat, 24 Jul 2021 07:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627113014; bh=Mv1/eRYBc1I9fHOa8WKJt5bRfdu+6ed/06JZaNQIYQk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vPEwRgGF3bV/0durqSpg8K1A8aNhEFHln8YmJvdQdfNHa9HSG3islM4dJvx1TsltO lWvwt0dCrvb71Kep06m5e4ub5MEAOjeh9+BSDiS9aLiHG1ufQxAfNTKB4XpnW+CPG+ Vd3ErK5k6Ssw3FvZTvdBDWueIP5BWEM0ynH0BLdE= Date: Sat, 24 Jul 2021 09:50:10 +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: <20210714124807.o22mottsrg3tv6nt@mobilestation> <20210721100220.ddfxwugivsndsedv@mobilestation> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210724_005015_419166_1DE1BF14 X-CRM114-Status: GOOD ( 25.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jul 23, 2021 at 02:54:54PM -0500, Bjorn Andersson wrote: > 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? I do it when Linus takes patches from my -linus branch in order to ensure they end up in my -next branch for testing and merge issues. > 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? I had already done the revert, I wasn't trying to keep anyone out of the loop here, sorry if it came across that way. I just wanted to ensure this got resolved quickly so I could move on to other issues. This is now 1f958f3dff42 ("Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"") in Linus's tree if you wish to cherry-pick it into your tree to resolve merge issues, sorry for the confusion. thanks, greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel