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=-3.9 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 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 34689C2B9F4 for ; Thu, 17 Jun 2021 16:35:55 +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 EC3A160C40 for ; Thu, 17 Jun 2021 16:35:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC3A160C40 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@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=JUMuqcUvLp0ssdwIylfmhKSA0+NaJBDxKf4jbZbP5bc=; b=i/mhzPRGnuZScr 9yP4BouloCRqNmnDoLVCH83R+tyfT5e2nWr+idnRqsAfi3D7DyycSVxwtsfnAlM1gtNsuH29jJCTp 7JE0O95fA5D/l+SXBPglAkrF35t9S2pq4RVoG+E1HtDf5z7tC1kebaRTFZE1dtk+j3ZwNsi+tcGU7 0W74MUQvCGLhkWmPaw+m9yWSFDSjbqsJuhQrZbi2vx2/LLiKEJzTsZU+EbNeTGs4erRZ0b2DXFbn2 U7yZiLZRSRQT7ZsBkqt2kdfgIyorKzqz+U96BGYcyAxrVEjE18yMJJqGtgH7X8D3ewB1ZIl5U+HCa xaNzqWoF/Wbpcy8AxZ+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltuyL-00B9aJ-Vj; Thu, 17 Jun 2021 16:34:30 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltuyI-00B9Rt-LI for linux-arm-kernel@lists.infradead.org; Thu, 17 Jun 2021 16:34:27 +0000 Received: by mail-pf1-x42f.google.com with SMTP id z26so5443991pfj.5 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=mofgjJolBOSxl9updSIVqkiZ0twDjcohy6Hs12Dq47TwyEU7PM+iCScxpx0ALHsD6B MYlt1xV7jpZFK8oxhDREOAxalzm/wDVcDSfo57DweaOlQY7K30Eb5TZgqKTrCqRmeNoy YeeTm77kMyY319L5hlrX+5//HBfMq8kYN5CKaYYxs7gwqU6iIpsyLdTzr89BSVH0nzrX IeUvE2f9w7ihhOtfVJeEsQzhX9s3PPTTXM8JCPFj1NZToXtSJh2uLE0HfZaHmiZay8fw K6LKwB9bt/1sqUhbRJXhPbjJkFAa78vIRYvquumVJK9+q7KWqOXn+c9X2mAQ6K8cYLed IsGg== X-Gm-Message-State: AOAM531FwS3X6Z1ZXw0ZQHcCv2FmSbD1yeL5GMlo5/uRlNbNFflwuG8r tS9yO/LnAeimbIyRliWP+wNm36c0XGaEsA== 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-Disposition: inline In-Reply-To: <20210617144346.564be887@canb.auug.org.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210617_093426_768906_D92A8276 X-CRM114-Status: GOOD ( 20.60 ) 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 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? _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel