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=-6.5 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 9C543C4338F for ; Fri, 6 Aug 2021 11:08:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7891A61181 for ; Fri, 6 Aug 2021 11:08:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245302AbhHFLIv (ORCPT ); Fri, 6 Aug 2021 07:08:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:56076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245297AbhHFLIu (ORCPT ); Fri, 6 Aug 2021 07:08:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EC0876105A; Fri, 6 Aug 2021 11:08:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628248114; bh=AkJthIdwA3V29erIPtuJUcVG20xxA45EHeqwN534hnQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UXEEbppUdgqwoHzcnkPkvP1EKPDDYQMBG1z6orahqF+tuEJOBJoUbJTdbjEtNTEjg gPfZQdCiK7kRtIQaWginYZo9k7LB1o2HJQc9HwtngAhge92PgdFfUZaoYvPq2sCxYk 50042xDQQ/ygwWfLhSC5AjyAY7jzqY4ixEyUv8Yc= Date: Fri, 6 Aug 2021 13:08:26 +0200 From: Greg Kroah-Hartman To: Mark Brown Cc: Andy Gross , Bjorn Andersson , Linux Kernel Mailing List , Linux Next Mailing List , AngeloGioacchino Del Regno Subject: Re: linux-next: manual merge of the qcom tree with the usb tree Message-ID: References: <20210806102138.27373-1-broonie@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210806102138.27373-1-broonie@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the qcom tree got a conflict in: > > arch/arm64/boot/dts/qcom/msm8996.dtsi > > between commit: > > 1f958f3dff42 ("Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"") > > from the usb tree and commit: > > 9da65e441d4d ("arm64: dts: qcom: Add support for SONY Xperia X Performance / XZ / XZs (msm8996, Tone platform)") > > from the qcom tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > diff --cc arch/arm64/boot/dts/qcom/msm8996.dtsi > index 78c55ca10ba9,31686950004e..000000000000 > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi Love the fix, did something go wrong? :)