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.9 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 41B88C48BE5 for ; Thu, 17 Jun 2021 16:34:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2805D6102A for ; Thu, 17 Jun 2021 16:34:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230381AbhFQQgf (ORCPT ); Thu, 17 Jun 2021 12:36:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229671AbhFQQgd (ORCPT ); Thu, 17 Jun 2021 12:36:33 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FE50C06175F for ; Thu, 17 Jun 2021 09:34:25 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id u190so1571356pgd.8 for ; Thu, 17 Jun 2021 09:34:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=4TO3eGw2DCtY6KaKGGAgRgperQUHgRHyPhb9mSeBbSA=; b=UokaqR6lQyOcL/DyR4tDeJOpDsOTRSHHXhEZPMyxOWw0D/wdAoUOF9woR6ln9HQhex V7irE3dv01MBH3QFjzNv33AkzExonvmaYh9cUBwS3UCHbwcVfxFUezkyeLkAhWQ4aGlU mur7IuAU7FGBO2ujoDfMLnhHZR6+RnepLlRdY= 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=4TO3eGw2DCtY6KaKGGAgRgperQUHgRHyPhb9mSeBbSA=; b=uoV2uNxSZmHUVQywIlnZ3Ec70Vbqpwv4E3kl0rI0m92IvIWQUac2n1UV5SuWUUoD9b qQMhfTWSJzFM0PDgRKEOY+G7Nhprvcn6tKq3lcLbqp/pwQNUrOxFRnnL2F6mygXxTJmx a1z1IxsiBbbTRZxuDXcn8zC0pUXcTae8aZ3dEBiVNilZ65eX+IQSm1RKMxO17Sx0yzn6 LsDVtNtFJIc3UEYh6iHpPv9auAxasHD1+QZyWEdyJdPjk6KVdssckuX8h6KmI2JpvWlu +d6MBEFpySFug14W1zdMgbrilv7qxJlz3Hzqjz6FlxkC6mkyEYBE0dc2egxeuuA2ZcgW 9Kig== X-Gm-Message-State: AOAM530m2E5S+4rW68DUvZLp8N+bQ/JKCqSDhZUWBCNFMN7GEBEMbhGT Su7A/La2GBA1sbSIkKZxE7XOSQ== X-Google-Smtp-Source: ABdhPJzNm/DmRxSVnzflpeGAkkhA2ZiyJ9Eav9Z9RzV92/085pNsD8vUpC6zar9O5pMLio667O69ww== X-Received: by 2002:a63:6644:: with SMTP id a65mr5637787pgc.431.1623947664763; Thu, 17 Jun 2021 09:34:24 -0700 (PDT) Received: from localhost ([2620:15c:202:201:14b4:cd2e:dd64:19e8]) by smtp.gmail.com with UTF8SMTPSA id o14sm2525081pjj.6.2021.06.17.09.34.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Jun 2021 09:34:24 -0700 (PDT) Date: Thu, 17 Jun 2021 09:34:21 -0700 From: Matthias Kaehlcke To: Stephen Rothwell Cc: Greg KH , Olof Johansson , Arnd Bergmann , ARM , Bjorn Andersson , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the usb tree with the arm-soc tree Message-ID: References: <20210617144346.564be887@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210617144346.564be887@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 17, 2021 at 02:43:46PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got conflicts in: > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > > between commit: > > 39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone") > > from the arm-soc tree and commit: > > 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub") > > from the usb 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. Thanks Stephen for fixing this up for -next! One option would be to revert 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub") from usb-next and land it through the qcom/arm-soc tree with the rest of the SC7180 device tree patches. Greg/Bjorn, does the above sound like a suitable solution to you or do you think it would be better to deal with the conflict in a different way?