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 D61A8C4320A for ; Fri, 23 Jul 2021 15:55:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE3FD60725 for ; Fri, 23 Jul 2021 15:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235781AbhGWPOd (ORCPT ); Fri, 23 Jul 2021 11:14:33 -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-arm-msm@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 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 E5424C4338F for ; Fri, 23 Jul 2021 15:56:48 +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 B964560EB5 for ; Fri, 23 Jul 2021 15:56:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B964560EB5 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=NfoOpFbVJtidNPH5nplMj066bJeIZhsUhPvXRZhmWK0=; b=qQAOf6p6F5KewJ HVrcsKMysZ0WLiGuhkoFa5LPd48+o8gIwBh9Y98Jwj3QswEgUqKdjUpZZpWUpC5dQ50lhhCATxrFl UN49xpYrDOn19p36yOevWgd8YXAL9wwhEpLxozYFsL28DKpw3mEYkzg3at5kwgDJzEXnCTrc6+bb7 NdqSSymIzkFA5CtGbaJfzcY63/ZxP7sjwaP4ZsKUbIvLzNbPy4jwvxsmHrFbayeMibnznJsrvFnWH Mq5bywOjZ+WNsPWTou5GfJP7/fBfJariKSB2QAMayFFdQgWtWfNvthWpDajG/OUeBX11zAimSc9kC ExroEAVUnG0kT4GQAsNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6xVs-005GPL-T7; Fri, 23 Jul 2021 15:55:01 +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 1m6xVo-005GOS-FC for linux-arm-kernel@lists.infradead.org; Fri, 23 Jul 2021 15:54:57 +0000 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-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210723_085456_604052_523BDA5E X-CRM114-Status: GOOD ( 14.63 ) 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 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel